From b2e6ed029590f3b6b2b413c44b2a446170dbfff5 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 30 Mar 2018 06:45:19 -0400 Subject: [PATCH] Fixes misc. typos found via `codespell -q 3` --- client/ma_plugin_info.c | 2 +- cmake/CheckFunctions.cmake | 2 +- cmake/CheckIncludeFiles.cmake | 2 +- cmake/CheckTypes.cmake | 2 +- examples/mysql_affected_rows.c | 2 +- include/ma_global.h | 10 +++++----- include/ma_pthread.h | 2 +- include/ma_sys.h | 18 +++++++++--------- include/ma_tls.h | 6 +++--- include/mariadb_com.h | 6 +++--- libmariadb/ma_array.c | 4 ++-- libmariadb/ma_client_plugin.c.in | 2 +- libmariadb/ma_dtoa.c | 2 +- libmariadb/ma_errmsg.c | 2 +- libmariadb/ma_hash.c | 6 +++--- libmariadb/ma_loaddata.c | 2 +- libmariadb/ma_net.c | 2 +- libmariadb/ma_password.c | 2 +- libmariadb/ma_pvio.c | 4 ++-- libmariadb/ma_string.c | 2 +- libmariadb/mariadb_dyncol.c | 12 ++++++------ libmariadb/mariadb_stmt.c | 14 +++++++------- libmariadb/secure/gnutls.c | 2 +- libmariadb/secure/ma_schannel.c | 14 +++++++------- mariadb_config/libmariadb.pc.in | 2 +- plugins/auth/mariadb_cleartext.c | 2 +- plugins/auth/my_auth.c | 2 +- plugins/connection/aurora.c | 2 +- plugins/io/remote_io.c | 10 +++++----- plugins/pvio/pvio_npipe.c | 2 +- unittest/libmariadb/getopt.c | 2 +- unittest/libmariadb/ma_getopt.c | 2 +- unittest/libmariadb/ps.c | 2 +- unittest/libmariadb/ps_bugs.c | 8 ++++---- unittest/mytap/tap.c | 6 +++--- win/packaging/license.rtf | 2 +- 36 files changed, 82 insertions(+), 82 deletions(-) diff --git a/client/ma_plugin_info.c b/client/ma_plugin_info.c index b015ba7f1..159513186 100644 --- a/client/ma_plugin_info.c +++ b/client/ma_plugin_info.c @@ -25,7 +25,7 @@ static struct option long_options[]= static char *values[] = { "show information for all plugins", - "show informaion for builtin plugins", + "show information for builtin plugins", "show information for dynamic plugins", "show information for dynamic plugins in specified directory", "show information for specified plugin", diff --git a/cmake/CheckFunctions.cmake b/cmake/CheckFunctions.cmake index d3d3be668..58a6db3c6 100644 --- a/cmake/CheckFunctions.cmake +++ b/cmake/CheckFunctions.cmake @@ -8,7 +8,7 @@ # This file is included by CMakeLists.txt and # checks for various functions. -# You will find the appropiate defines in +# You will find the appropriate defines in # include/my_config.h.in INCLUDE(CheckFunctionExists) diff --git a/cmake/CheckIncludeFiles.cmake b/cmake/CheckIncludeFiles.cmake index 89b40ad59..641ffbdf4 100644 --- a/cmake/CheckIncludeFiles.cmake +++ b/cmake/CheckIncludeFiles.cmake @@ -7,7 +7,7 @@ # # This file is included by CMakeLists.txt and # checks for various header files. -# You will find the appropiate defines in +# You will find the appropriate defines in # include/my_config.h.in INCLUDE(CheckIncludeFiles) diff --git a/cmake/CheckTypes.cmake b/cmake/CheckTypes.cmake index 97605e207..e5c1e6430 100644 --- a/cmake/CheckTypes.cmake +++ b/cmake/CheckTypes.cmake @@ -7,7 +7,7 @@ # # This file is included by CMakeLists.txt and # checks for type sizes. -# You will find the appropiate defines in +# You will find the appropriate defines in # include/my_config.h.in INCLUDE (CheckTypeSize) diff --git a/examples/mysql_affected_rows.c b/examples/mysql_affected_rows.c index c72ce8de6..d125e80c6 100644 --- a/examples/mysql_affected_rows.c +++ b/examples/mysql_affected_rows.c @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) (unsigned long) mysql_affected_rows(mysql)); mysql_free_result(result); - /* Affected rows with DELETE statment */ + /* Affected rows with DELETE statement */ query= "DELETE FROM affected_rows"; if (mysql_real_query(mysql, query, strlen(query))) show_error(mysql); diff --git a/include/ma_global.h b/include/ma_global.h index 790fb991a..ce96b0022 100644 --- a/include/ma_global.h +++ b/include/ma_global.h @@ -366,7 +366,7 @@ typedef int (*qsort_cmp)(const void *,const void *); #undef QSORT_TYPE_IS_VOID #define QSORT_TYPE_IS_VOID #else -#define qsort_t RETQSORTTYPE /* Broken GCC cant handle typedef !!!! */ +#define qsort_t RETQSORTTYPE /* Broken GCC can't handle typedef !!!! */ #endif #ifdef HAVE_SYS_SOCKET_H @@ -457,7 +457,7 @@ typedef SOCKET_SIZE_TYPE size_socket; #define NO_MISAM /* Not needed anymore */ #define NO_HASH /* Not needed anymore */ #ifdef _WIN32 -#define NO_DIR_LIBRARY /* Not standar dir-library */ +#define NO_DIR_LIBRARY /* Not standard dir-library */ #define USE_MY_STAT_STRUCT /* For my_lib */ #ifdef _MSC_VER typedef SSIZE_T ssize_t; @@ -580,12 +580,12 @@ extern double my_atof(const char*); /* Max size that must be added to a so that we know Size to make - adressable obj. + addressable obj. */ typedef long my_ptrdiff_t; #define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1)) #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) -/* Size to make adressable obj. */ +/* Size to make addressable obj. */ #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t))) /* Offset of filed f in structure t */ #define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) @@ -593,7 +593,7 @@ typedef long my_ptrdiff_t; #define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((unsigned char*) (A) - (unsigned char*) (B)) #define NullS (char *) 0 -/* Nowdays we do not support MessyDos */ +/* Nowadays we do not support MessyDos */ #ifndef NEAR #define NEAR /* Who needs segments ? */ #define FAR /* On a good machine */ diff --git a/include/ma_pthread.h b/include/ma_pthread.h index 7383367e8..0273a6be4 100644 --- a/include/ma_pthread.h +++ b/include/ma_pthread.h @@ -272,7 +272,7 @@ extern int my_pthread_cond_init(pthread_cond_t *mp, #endif #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX) -int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ +int sigwait(sigset_t *setp, int *sigp); /* Use our implementation */ #endif #if !defined(HAVE_SIGSET) && !defined(my_sigset) #define my_sigset(A,B) do { struct sigaction s; sigset_t set; \ diff --git a/include/ma_sys.h b/include/ma_sys.h index 400d11ca8..e0515dd65 100644 --- a/include/ma_sys.h +++ b/include/ma_sys.h @@ -47,15 +47,15 @@ typedef struct my_aio_result { /* General bitmaps for my_func's */ #define MY_FFNF 1 /* Fatal if file not found */ -#define MY_FNABP 2 /* Fatal if not all bytes read/writen */ -#define MY_NABP 4 /* Error if not all bytes read/writen */ +#define MY_FNABP 2 /* Fatal if not all bytes read/written */ +#define MY_NABP 4 /* Error if not all bytes read/written */ #define MY_FAE 8 /* Fatal if any error */ #define MY_WME 16 /* Write message on error */ #define MY_WAIT_IF_FULL 32 /* Wait and try again if disk full error */ #define MY_RAID 64 /* Support for RAID (not the "Johnson&Johnson"-s one ;) */ #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */ #define MY_LINK_WARNING 32 /* my_redel() gives warning if links */ -#define MY_COPYTIME 64 /* my_redel() copys time */ +#define MY_COPYTIME 64 /* my_redel() copies time */ #define MY_DELETE_OLD 256 /* my_create_with_symlink() */ #define MY_RESOLVE_LINK 128 /* my_realpath(); Only resolve links */ #define MY_HOLD_ORIGINAL_MODES 128 /* my_copy() holds to file modes */ @@ -79,8 +79,8 @@ typedef struct my_aio_result { #define ME_HOLDTANG 8 /* Don't delete last keys */ #define ME_WAITTOT 16 /* Wait for errtime secs of for a action */ #define ME_WAITTANG 32 /* Wait for a user action */ -#define ME_NOREFRESH 64 /* Dont refresh screen */ -#define ME_NOINPUT 128 /* Dont use the input libary */ +#define ME_NOREFRESH 64 /* Don't refresh screen */ +#define ME_NOINPUT 128 /* Don't use the input library */ #define ME_COLOUR1 ((1 << ME_HIGHBYTE)) /* Possibly error-colours */ #define ME_COLOUR2 ((2 << ME_HIGHBYTE)) #define ME_COLOUR3 ((3 << ME_HIGHBYTE)) @@ -195,7 +195,7 @@ extern void (*my_sigtstp_cleanup)(void), /* Executed before jump to shell */ (*my_sigtstp_restart)(void), (*my_abort_hook)(int); - /* Executed when comming from shell */ + /* Executed when coming from shell */ extern int NEAR ma_umask, /* Default creation mask */ NEAR ma_umask_dir, NEAR my_recived_signals, /* Signals we have got */ @@ -233,7 +233,7 @@ enum cache_type {READ_CACHE,WRITE_CACHE,READ_FIFO,READ_NET,WRITE_NET}; enum flush_type { FLUSH_KEEP, FLUSH_RELEASE, FLUSH_IGNORE_CHANGED, FLUSH_FORCE_WRITE}; -typedef struct st_record_cache /* Used when cacheing records */ +typedef struct st_record_cache /* Used when caching records */ { File file; int rc_seek,error,inited; @@ -274,7 +274,7 @@ typedef struct st_dynamic_string { } DYNAMIC_STRING; -typedef struct st_io_cache /* Used when cacheing files */ +typedef struct st_io_cache /* Used when caching files */ { my_off_t pos_in_file,end_of_file; unsigned char *rc_pos,*rc_end,*buffer,*rc_request_pos; @@ -319,7 +319,7 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); ((info)->rc_pos+=(Count)),0) :\ _my_b_write(info,Buffer,Count)) - /* my_b_write_byte dosn't have any err-check */ + /* my_b_write_byte doesn't have any err-check */ #define my_b_write_byte(info,chr) \ (((info)->rc_pos < (info)->rc_end) ?\ ((*(info)->rc_pos++)=(chr)) :\ diff --git a/include/ma_tls.h b/include/ma_tls.h index 86f6fd7a1..9ce49e7c9 100644 --- a/include/ma_tls.h +++ b/include/ma_tls.h @@ -36,7 +36,7 @@ typedef struct st_ma_pvio_tls { errmsg_len length of error message buffer Returns: 0 success - 1 if an error occured + 1 if an error occurred Notes: On success the global variable ma_tls_initialized will be set to 1 */ @@ -77,7 +77,7 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls); length buffer length Returns: 0-n bytes read - -1 if an error occured + -1 if an error occurred */ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length); @@ -89,7 +89,7 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length); length buffer length Returns: 0-n bytes written - -1 if an error occured + -1 if an error occurred */ ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length); diff --git a/include/mariadb_com.h b/include/mariadb_com.h index b557232dc..9a5da28dd 100644 --- a/include/mariadb_com.h +++ b/include/mariadb_com.h @@ -247,7 +247,7 @@ enum enum_server_command struct st_ma_pvio; typedef struct st_ma_pvio MARIADB_PVIO; -#define MAX_CHAR_WIDTH 255 /* Max length for a CHAR colum */ +#define MAX_CHAR_WIDTH 255 /* Max length for a CHAR column */ #define MAX_BLOB_WIDTH 8192 /* Default width for blob */ /* the following defines were added for PHP's mysqli and pdo extensions: @@ -345,8 +345,8 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, MYSQL_TYPE_GEOMETRY=255, MAX_NO_FIELD_TYPES }; -#define FIELD_TYPE_CHAR FIELD_TYPE_TINY /* For compability */ -#define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM /* For compability */ +#define FIELD_TYPE_CHAR FIELD_TYPE_TINY /* For compatibility */ +#define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM /* For compatibility */ #define FIELD_TYPE_DECIMAL MYSQL_TYPE_DECIMAL #define FIELD_TYPE_NEWDECIMAL MYSQL_TYPE_NEWDECIMAL #define FIELD_TYPE_TINY MYSQL_TYPE_TINY diff --git a/libmariadb/ma_array.c b/libmariadb/ma_array.c index a39e1a19c..d067aa4a3 100644 --- a/libmariadb/ma_array.c +++ b/libmariadb/ma_array.c @@ -16,7 +16,7 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA */ -/* Handling of arrays that can grow dynamicly. */ +/* Handling of arrays that can grow dynamically. */ #undef SAFEMALLOC /* Problems with threads */ @@ -59,7 +59,7 @@ my_bool ma_insert_dynamic(DYNAMIC_ARRAY *array, void *element) { void *buffer; if (array->elements == array->max_element) - { /* Call only when nessesary */ + { /* Call only when necessary */ if (!(buffer=ma_alloc_dynamic(array))) return TRUE; } diff --git a/libmariadb/ma_client_plugin.c.in b/libmariadb/ma_client_plugin.c.in index 5db8b3706..8d61d3179 100644 --- a/libmariadb/ma_client_plugin.c.in +++ b/libmariadb/ma_client_plugin.c.in @@ -261,7 +261,7 @@ static void load_env_plugins(MYSQL *mysql) This function must be called before any other client plugin function. @retval 0 successful - @retval != 0 error occured + @retval != 0 error occurred */ int mysql_client_plugin_init() diff --git a/libmariadb/ma_dtoa.c b/libmariadb/ma_dtoa.c index 4238c3c64..5d67f7b51 100644 --- a/libmariadb/ma_dtoa.c +++ b/libmariadb/ma_dtoa.c @@ -271,7 +271,7 @@ size_t ma_gcvt(double x, my_gcvt_arg_type type, int width, char *to, Assume that we don't have enough space to place all significant digits in the 'f' format. We have to choose between the 'e' format and the 'f' one to keep as many significant digits as possible. - Let E and F be the lengths of decimal representaion in the 'e' and 'f' + Let E and F be the lengths of decimal representation in the 'e' and 'f' formats, respectively. We want to use the 'f' format if, and only if F <= E. Consider the following cases: 1. decpt <= 0. diff --git a/libmariadb/ma_errmsg.c b/libmariadb/ma_errmsg.c index 5c7884b3a..d668c779e 100644 --- a/libmariadb/ma_errmsg.c +++ b/libmariadb/ma_errmsg.c @@ -117,7 +117,7 @@ const char *client_errors[]= /* 2032 */ "Data truncated", /* 2033 */ "", /* 2034 */ "Invalid parameter number", -/* 2035 */ "Invalid buffer type: %d (paraneter: %d)", +/* 2035 */ "Invalid buffer type: %d (parameter: %d)", /* 2036 */ "Buffer type is not supported", /* 2037 */ "Shared memory: %-.64s", /* 2038 */ "Shared memory connection failed during %s. (%lu)", diff --git a/libmariadb/ma_hash.c b/libmariadb/ma_hash.c index 810017121..a79130ddf 100644 --- a/libmariadb/ma_hash.c +++ b/libmariadb/ma_hash.c @@ -21,7 +21,7 @@ is freely available from http://www.php.net *************************************************************************************/ -/* The hash functions used for saveing keys */ +/* The hash functions used for saving keys */ /* One of key_length or key_length_offset must be given */ /* Key length of 0 isn't allowed */ @@ -131,7 +131,7 @@ static uint calc_hashnr(const uchar *key,uint length) return((uint) nr); } - /* Calc hashvalue for a key, case indepenently */ + /* Calc hashvalue for a key, case independently */ static uint calc_hashnr_caseup(const uchar *key,uint length) { @@ -505,7 +505,7 @@ my_bool hash_delete(HASH *hash,uchar *record) /* Update keys when record has changed. - This is much more efficent than using a delete & insert. + This is much more efficient than using a delete & insert. */ my_bool hash_update(HASH *hash,uchar *record,uchar *old_key,uint old_key_length) diff --git a/libmariadb/ma_loaddata.c b/libmariadb/ma_loaddata.c index 0dd30dcfa..9332c7cf2 100644 --- a/libmariadb/ma_loaddata.c +++ b/libmariadb/ma_loaddata.c @@ -242,7 +242,7 @@ my_bool mysql_handle_local_infile(MYSQL *conn, const char *filename) goto infile_error; } - /* error during read occured */ + /* error during read occurred */ if (bufread < 0) { char tmp_buf[MYSQL_ERRMSG_SIZE]; diff --git a/libmariadb/ma_net.c b/libmariadb/ma_net.c index a28e2126b..07460eb85 100644 --- a/libmariadb/ma_net.c +++ b/libmariadb/ma_net.c @@ -17,7 +17,7 @@ /* Write and read of logical packets to/from socket ** Writes are cached into net_buffer_length big packets. - ** Read packets are reallocated dynamicly when reading big packets. + ** Read packets are reallocated dynamically when reading big packets. ** Each logical packet has the following pre-info: ** 3 byte length & 1 byte package-number. */ diff --git a/libmariadb/ma_password.c b/libmariadb/ma_password.c index c3dcdc4cf..0db4e036f 100644 --- a/libmariadb/ma_password.c +++ b/libmariadb/ma_password.c @@ -69,7 +69,7 @@ void ma_hash_password(ulong *result, const char *password, size_t len) for (; password < password_end; password++) { if (*password == ' ' || *password == '\t') - continue; /* skipp space in password */ + continue; /* skip space in password */ tmp= (ulong) (uchar) *password; nr^= (((nr & 63)+add)*tmp)+ (nr << 8); nr2+=(nr2 << 8) ^ nr; diff --git a/libmariadb/ma_pvio.c b/libmariadb/ma_pvio.c index 891d4ea76..6c940f3ad 100644 --- a/libmariadb/ma_pvio.c +++ b/libmariadb/ma_pvio.c @@ -23,7 +23,7 @@ component of the client library. PVIO support various protcols like sockets, pipes and shared memory, which are - implemented as plugins and can be extended therfore easily. + implemented as plugins and can be extended therefore easily. Interface function description: @@ -114,7 +114,7 @@ MARIADB_PVIO *ma_pvio_init(MA_PVIO_CINFO *cinfo) pvio->set_error= my_set_error; pvio->type= cinfo->type; - /* set timeout to connect timeout - after successfull connect we will set + /* set timeout to connect timeout - after successful connect we will set * correct values for read and write */ if (pvio->methods->set_timeout) { diff --git a/libmariadb/ma_string.c b/libmariadb/ma_string.c index be3a21f2c..9e8773eb5 100644 --- a/libmariadb/ma_string.c +++ b/libmariadb/ma_string.c @@ -17,7 +17,7 @@ MA 02111-1301, USA */ /* - Code for handling strings with can grow dynamicly. + Code for handling strings which can grow dynamically. Copyright Monty Program KB. By monty. */ diff --git a/libmariadb/mariadb_dyncol.c b/libmariadb/mariadb_dyncol.c index e4124ff0d..63be77720 100644 --- a/libmariadb/mariadb_dyncol.c +++ b/libmariadb/mariadb_dyncol.c @@ -1185,7 +1185,7 @@ dynamic_column_decimal_store(DYNAMIC_COLUMN *str, /** Prepare the value to be used as decimal. - @param value The value structure which sould be setup. + @param value The value structure which should be setup. */ void mariadb_dyncol_prepare_decimal(DYNAMIC_COLUMN_VALUE *value) @@ -2093,7 +2093,7 @@ static uchar *find_entry_named(DYN_HEADER *hdr, LEX_STRING *key) /** Write number in the buffer (backward direction - starts from the buffer end) - @return pointer on the number begining + @return pointer on the number beginning */ static char *backwritenum(char *chr, uint numkey) @@ -2163,7 +2163,7 @@ find_column(DYN_HEADER *hdr, uint numkey, LEX_STRING *strkey) hdr->length= hdr_interval_length(hdr, hdr->entry + hdr->entry_size); hdr->data= hdr->dtpool + hdr->offset; /* - Check that the found data is withing the ranges. This can happen if + Check that the found data is within the ranges. This can happen if we get data with wrong offsets. */ if (hdr->length == DYNCOL_OFFSET_ERROR || @@ -3502,7 +3502,7 @@ dynamic_column_update_many_fmt(DYNAMIC_COLUMN *str, if (plan[i].val->type == DYN_COL_NULL) { - plan[i].act= PLAN_NOP; /* Mark entry to be skiped */ + plan[i].act= PLAN_NOP; /* Mark entry to be skipped */ } else { @@ -4144,7 +4144,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json, hdr_interval_length(&header, header.entry + header.entry_size); header.data= header.dtpool + header.offset; /* - Check that the found data is withing the ranges. This can happen if + Check that the found data is within the ranges. This can happen if we get data with wrong offsets. */ if (header.length == DYNCOL_OFFSET_ERROR || @@ -4283,7 +4283,7 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str, hdr_interval_length(&header, header.entry + header.entry_size); header.data= header.dtpool + header.offset; /* - Check that the found data is withing the ranges. This can happen if + Check that the found data is within the ranges. This can happen if we get data with wrong offsets. */ if (header.length == DYNCOL_OFFSET_ERROR || diff --git a/libmariadb/mariadb_stmt.c b/libmariadb/mariadb_stmt.c index d5deff9e4..d0ce3c296 100644 --- a/libmariadb/mariadb_stmt.c +++ b/libmariadb/mariadb_stmt.c @@ -727,7 +727,7 @@ unsigned char* mysql_stmt_execute_generate_simple_request(MYSQL_STMT *stmt, size } for (i = 0; i < stmt->param_count; i++) { - /* this differs from mysqlnd, c api supports unsinged !! */ + /* this differs from mysqlnd, c api supports unsigned !! */ uint buffer_type= stmt->params[i].buffer_type | (stmt->params[i].is_unsigned ? 32768 : 0); /* check if parameter requires indicator variable */ int2store(p, buffer_type); @@ -912,7 +912,7 @@ unsigned char* mysql_stmt_execute_generate_bulk_request(MYSQL_STMT *stmt, size_t } for (i = 0; i < stmt->param_count; i++) { - /* this differs from mysqlnd, c api supports unsinged !! */ + /* this differs from mysqlnd, c api supports unsigned !! */ uint buffer_type= stmt->params[i].buffer_type | (stmt->params[i].is_unsigned ? 32768 : 0); int2store(p, buffer_type); p+= 2; @@ -1504,7 +1504,7 @@ my_bool mthd_stmt_read_prepare_response(MYSQL_STMT *stmt) p= (uchar *)stmt->mysql->net.read_pos; - if (0xFF == p[0]) /* Error occured */ + if (0xFF == p[0]) /* Error occurred */ { return(1); } @@ -1581,7 +1581,7 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, unsigned lon is_multi= (mysql->net.extension->multi_status > COM_MULTI_OFF); /* We need to semi-close the prepared statement: reset stmt and free all buffers and close the statement - on server side. Statment handle will get a new stmt_id */ + on server side. Statement handle will get a new stmt_id */ if (!is_multi) ma_multi_command(mysql, COM_MULTI_ENABLED); @@ -1805,11 +1805,11 @@ int stmt_read_execute_response(MYSQL_STMT *stmt) ret= test((mysql->methods->db_read_stmt_result && mysql->methods->db_read_stmt_result(mysql))); - /* if a reconnect occured, our connection handle is invalid */ + /* if a reconnect occurred, our connection handle is invalid */ if (!stmt->mysql) return(1); - /* update affected rows, also if an error occured */ + /* update affected rows, also if an error occurred */ stmt->upsert_status.affected_rows= stmt->mysql->affected_rows; if (ret) @@ -2354,7 +2354,7 @@ int STDCALL mariadb_stmt_execute_direct(MYSQL_STMT *stmt, { /* We need to semi-close the prepared statement: reset stmt and free all buffers and close the statement - on server side. Statment handle will get a new stmt_id */ + on server side. Statement handle will get a new stmt_id */ char stmt_id[STMT_ID_LENGTH]; if (mysql_stmt_internal_reset(stmt, 1)) diff --git a/libmariadb/secure/gnutls.c b/libmariadb/secure/gnutls.c index cbacb14aa..9ba95849e 100644 --- a/libmariadb/secure/gnutls.c +++ b/libmariadb/secure/gnutls.c @@ -1318,7 +1318,7 @@ my_bool ma_tls_close(MARIADB_TLS *ctls) gnutls_certificate_credentials_t ctx; struct st_gnutls_data *data= (struct st_gnutls_data *)gnutls_session_get_ptr(ctls->ssl); - /* this would be the correct way, however can't dectect afterwards + /* this would be the correct way, however can't detect afterwards if the socket is closed or not, so we don't send encrypted finish alert. rc= gnutls_bye((gnutls_session_t )ctls->ssl, GNUTLS_SHUT_WR); diff --git a/libmariadb/secure/ma_schannel.c b/libmariadb/secure/ma_schannel.c index 53f8621c3..4b281401c 100644 --- a/libmariadb/secure/ma_schannel.c +++ b/libmariadb/secure/ma_schannel.c @@ -52,13 +52,13 @@ void ma_schannel_set_sec_error(MARIADB_PVIO *pvio, DWORD ErrorNo) pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: Invalid message sequence"); break; case SEC_E_DECRYPT_FAILURE: - pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: An error occured during decrypting data"); + pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: An error occurred during decrypting data"); break; case SEC_I_INCOMPLETE_CREDENTIALS: pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: Incomplete credentials"); break; case SEC_E_ENCRYPT_FAILURE: - pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: An error occured during encrypting data"); + pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: An error occurred during encrypting data"); break; case SEC_I_CONTEXT_EXPIRED: pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "SSL connection error: Context expired "); @@ -95,7 +95,7 @@ void ma_schannel_set_win_error(MARIADB_PVIO *pvio) pvio->set_error(pvio->mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, "Unknown SSL error"); return; } - /* todo: obtain error messge */ + /* todo: obtain error message */ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, ssl_errno, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &ssl_error_reason, 0, NULL ); @@ -288,7 +288,7 @@ PCCRL_CONTEXT ma_schannel_create_crl_context(MARIADB_PVIO *pvio, const char *pem /* {{{ my_bool ma_schannel_load_private_key(MARIADB_PVIO *pvio, CERT_CONTEXT *ctx, char *key_file) */ /* - Load privte key into context + Load private key into context SYNOPSIS ma_schannel_load_private_key() @@ -661,7 +661,7 @@ SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls) sRet= ma_schannel_handshake_loop(pvio, TRUE, &ExtraData); /* allocate IO-Buffer for write operations: After handshake - was successfull, we are able now to calculate payload */ + was successful, we are able now to calculate payload */ if ((sRet = QueryContextAttributes(&sctx->ctxt, SECPKG_ATTR_STREAM_SIZES, &sctx->Sizes ))) goto end; @@ -701,7 +701,7 @@ SECURITY_STATUS ma_schannel_client_handshake(MARIADB_TLS *ctls) RETURN SEC_E_OK on success - SEC_E_* if an error occured + SEC_E_* if an error occurred */ SECURITY_STATUS ma_schannel_read_decrypt(MARIADB_PVIO *pvio, @@ -913,7 +913,7 @@ my_bool ma_schannel_verify_certs(MARIADB_TLS *ctls) RETURN SEC_E_OK on success - SEC_E_* if an error occured + SEC_E_* if an error occurred */ ssize_t ma_schannel_write_encrypt(MARIADB_PVIO *pvio, uchar *WriteBuffer, diff --git a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in index e91615541..5cc5a212e 100644 --- a/mariadb_config/libmariadb.pc.in +++ b/mariadb_config/libmariadb.pc.in @@ -2,7 +2,7 @@ # pkg_config.pc.in # # pkg_config configuration file -# For a detailled description of options, please visit +# For a detailed description of options, please visit # Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) # diff --git a/plugins/auth/mariadb_cleartext.c b/plugins/auth/mariadb_cleartext.c index 0ab68c099..b63c1d3be 100644 --- a/plugins/auth/mariadb_cleartext.c +++ b/plugins/auth/mariadb_cleartext.c @@ -40,7 +40,7 @@ RETURN CR_OK - CR_ERROR if an error occured + CR_ERROR if an error occurred */ static int clear_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql) { diff --git a/plugins/auth/my_auth.c b/plugins/auth/my_auth.c index af3cd7f5d..8db6e04ea 100644 --- a/plugins/auth/my_auth.c +++ b/plugins/auth/my_auth.c @@ -383,7 +383,7 @@ static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf) to send data to the server. It transparently wraps the data into a change user or authentication - handshake packet, if neccessary. + handshake packet, if necessary. */ static int client_mpvio_write_packet(struct st_plugin_vio *mpv, diff --git a/plugins/connection/aurora.c b/plugins/connection/aurora.c index c62726d34..4b8a52f2c 100644 --- a/plugins/connection/aurora.c +++ b/plugins/connection/aurora.c @@ -278,7 +278,7 @@ int aurora_get_instance_type(MYSQL *mysql) * * Returns: * 1 on success - * 0 if an error occured or primary_id couldn't be + * 0 if an error occurred or primary_id couldn't be * found */ my_bool aurora_get_primary_id(MYSQL *mysql, AURORA *aurora) diff --git a/plugins/io/remote_io.c b/plugins/io/remote_io.c index bb0a904af..1ac2d2924 100644 --- a/plugins/io/remote_io.c +++ b/plugins/io/remote_io.c @@ -183,7 +183,7 @@ static int fill_buffer(MA_FILE *file, size_t want) MA_REMOTE_FILE *rf= (MA_REMOTE_FILE *)file->ptr; /* only attempt to fill buffer if transactions still running and buffer - doesnt exceed required size already */ + doesn't exceed required size already */ if (!rf->in_progress || (rf->offset > want)) return 0; @@ -273,7 +273,7 @@ static int use_buffer(MA_FILE *file,int want) MA_FILE *ma_rio_open(const char *url,const char *operation) { /* this code could check for URLs or types in the 'url' and - basicly use the real fopen() for standard files */ + basically use the real fopen() for standard files */ MA_FILE *file; MA_REMOTE_FILE *rf; @@ -374,7 +374,7 @@ size_t ma_rio_read(void *ptr, size_t size, size_t nmemb, MA_FILE *file) fill_buffer(file,want); - /* check if theres data in the buffer - if not fill_buffer() + /* check if there's data in the buffer - if not fill_buffer() * either errored or EOF */ if(!rf->offset) return 0; @@ -411,7 +411,7 @@ char *ma_rio_gets(char *ptr, size_t size, MA_FILE *file) MA_REMOTE_FILE *rf= (MA_REMOTE_FILE *)file->ptr; fill_buffer(file,want); - /* check if theres data in the buffer - if not fill either errored or + /* check if there's data in the buffer - if not fill either errored or * EOF */ if(!rf->offset) return NULL; @@ -431,7 +431,7 @@ char *ma_rio_gets(char *ptr, size_t size, MA_FILE *file) /* xfer data to caller */ memcpy(ptr, rf->buffer, want); - ptr[want]=0;/* allways null terminate */ + ptr[want]=0;/* always null terminate */ use_buffer(file,want); diff --git a/plugins/pvio/pvio_npipe.c b/plugins/pvio/pvio_npipe.c index 1068d2c86..e3900ddfe 100644 --- a/plugins/pvio/pvio_npipe.c +++ b/plugins/pvio/pvio_npipe.c @@ -374,7 +374,7 @@ my_bool pvio_npipe_is_alive(MARIADB_PVIO *pvio) if (!pvio || !pvio->data) return FALSE; handle= ((struct st_pvio_npipe *)pvio->data)->pipe; - /* Copy data fron named pipe without removing it */ + /* Copy data from named pipe without removing it */ if (PeekNamedPipe(handle, NULL, 0, NULL, NULL, NULL)) return TRUE; return test(GetLastError() != ERROR_BROKEN_PIPE); diff --git a/unittest/libmariadb/getopt.c b/unittest/libmariadb/getopt.c index 411f4ba7e..50debeffa 100644 --- a/unittest/libmariadb/getopt.c +++ b/unittest/libmariadb/getopt.c @@ -7,7 +7,7 @@ Free Software Foundation, Inc. Changes by monty: -- Added include of string.h when nessessary. +- Added include of string.h when necessary. - Removed two warnings from gcc. This file is part of the GNU C Library. Its master source is NOT part of diff --git a/unittest/libmariadb/ma_getopt.c b/unittest/libmariadb/ma_getopt.c index 00064af1a..186cdcd53 100644 --- a/unittest/libmariadb/ma_getopt.c +++ b/unittest/libmariadb/ma_getopt.c @@ -7,7 +7,7 @@ Free Software Foundation, Inc. Changes by monty: -- Added include of string.h when nessessary. +- Added include of string.h when necessary. - Removed two warnings from gcc. This file is part of the GNU C Library. Its master source is NOT part of diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c index 745aff8f0..ffba49182 100644 --- a/unittest/libmariadb/ps.c +++ b/unittest/libmariadb/ps.c @@ -4018,7 +4018,7 @@ static int test_rewind(MYSQL *mysql) rc= mysql_stmt_bind_result(stmt, &my_bind); check_stmt_rc(rc, stmt); - /* retreive all result sets till we are at the end */ + /* retrieve all result sets till we are at the end */ while(!(rc=mysql_stmt_fetch(stmt))); FAIL_UNLESS(rc == MYSQL_NO_DATA, "rc != MYSQL_NO_DATA"); diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c index 07b5a2f2d..c5cd53cde 100644 --- a/unittest/libmariadb/ps_bugs.c +++ b/unittest/libmariadb/ps_bugs.c @@ -720,7 +720,7 @@ static int test_bug15518(MYSQL *mysql) /* Use the same stmt and reprepare with another query that - suceeds + succeeds */ rc= mysql_stmt_prepare(stmt, "SHOW STATUS", 12); FAIL_UNLESS(!rc || mysql_stmt_errno(stmt) || mysql_errno(mysql), "Error expected"); @@ -740,7 +740,7 @@ static int test_bug15518(MYSQL *mysql) /* Use the same stmt and reprepare with another query that - suceeds. The prepare should fail with error 2013 since + succeeds. The prepare should fail with error 2013 since connection to server has been closed. */ rc= mysql_stmt_prepare(stmt, "SHOW STATUS", 12); @@ -2658,7 +2658,7 @@ static int test_bug5194(MYSQL *mysql) MAX_PARAM_COUNT * CHARS_PER_PARAM + 1); param_str= (char*) malloc(COLUMN_COUNT * CHARS_PER_PARAM); - FAIL_IF(my_bind == 0 || query == 0 || param_str == 0, "Not enought memory") + FAIL_IF(my_bind == 0 || query == 0 || param_str == 0, "Not enough memory") stmt= mysql_stmt_init(mysql); @@ -2976,7 +2976,7 @@ static int test_bug6096(MYSQL *mysql) check_mysql_rc(rc, mysql); query_result= mysql_store_result(mysql); query_field_list= mysql_fetch_fields(query_result); - FAIL_IF(!query_field_list, "fetch_fields faild"); + FAIL_IF(!query_field_list, "fetch_fields failed"); query_field_count= mysql_num_fields(query_result); stmt= mysql_stmt_init(mysql); diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c index 40f79366b..d0b52f4df 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -485,9 +485,9 @@ int exit_status() { At the end, a complete test report should be written, with some statistics. If the test returns EXIT_SUCCESS, all tests were - successfull, otherwise at least one test failed. + successful, otherwise at least one test failed. - To get a TAP complient output and exit status, report the exit + To get a TAP compliant output and exit status, report the exit status in the following manner: @code @@ -525,7 +525,7 @@ int exit_status() { @subsection JustToBeSafeTest Writing unnecessarily large tests Don't write tests that use parameters in the range 1-1024 unless - you have a very good reason to belive that the component will + you have a very good reason to believe that the component will succeed for 562 but fail for 564 (the numbers picked are just examples). diff --git a/win/packaging/license.rtf b/win/packaging/license.rtf index 6b6d2806e..1ed386093 100644 --- a/win/packaging/license.rtf +++ b/win/packaging/license.rtf @@ -251,7 +251,7 @@ ary facilities. This must be distributed under the terms of the Sections above. rm of the same work. \par \par \hich\af31506\dbch\af31505\loch\f31506 - 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and wil + 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will \hich\af31506\dbch\af31505\loch\f31506 l automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. \par