diff options
| -rw-r--r-- | BUILD-CMAKE | 2 | ||||
| -rw-r--r-- | Docs/sp-imp-spec.txt | 4 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rwxr-xr-x | debian/autobake-deb.sh | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.3.mysql.init | 2 | ||||
| -rw-r--r-- | include/m_ctype.h | 4 | ||||
| -rw-r--r-- | include/my_atomic.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 8 | ||||
| -rw-r--r-- | include/my_pthread.h | 4 | ||||
| -rw-r--r-- | include/mysql/service_thd_rnd.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 4 | ||||
| -rw-r--r-- | man/mysql-test-run.pl.1 | 4 | ||||
| -rw-r--r-- | man/mysql.1 | 2 | ||||
| -rw-r--r-- | mysys/my_atomic_writes.c | 2 | ||||
| -rw-r--r-- | mysys/my_context.c | 2 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 2 | ||||
| -rw-r--r-- | mysys/thr_mutex.c | 4 | ||||
| -rw-r--r-- | strings/ctype-uca.c | 6 | ||||
| -rw-r--r-- | strings/decimal.c | 2 | ||||
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
21 files changed, 32 insertions, 32 deletions
diff --git a/BUILD-CMAKE b/BUILD-CMAKE index c95482cf619..aedce4400c6 100644 --- a/BUILD-CMAKE +++ b/BUILD-CMAKE @@ -97,7 +97,7 @@ shell>cd ../build shell>cmake ../src Note: if a directory was used for in-source build, out-of-source will -not work. To reenable out-of-source build, remove <source-root>/CMakeCache.txt +not work. To re-enable out-of-source build, remove <source-root>/CMakeCache.txt file. diff --git a/Docs/sp-imp-spec.txt b/Docs/sp-imp-spec.txt index f2794e14793..0526cc43f81 100644 --- a/Docs/sp-imp-spec.txt +++ b/Docs/sp-imp-spec.txt @@ -323,7 +323,7 @@ One "obvious" solution would be to simply push "mysql.proc" to the list of tables used by the query, but this implies a "join" with this table if the query is a select, so it doesn't work (and we can't exclude this - table easily; since a priviledged used might in fact want to search + table easily; since a privileged used might in fact want to search the proc table). Another solution would of course be to allow the opening and closing of the mysql.proc table during a query execution, but this it not @@ -400,7 +400,7 @@ instruction. Calling and returning from a CONTINUE handler poses some special - problems. Since we need to return to the point after its invokation, + problems. Since we need to return to the point after its invocation, we push the return location on a stack in the sp_rcontext (this is done by the exectution loop). The handler then ends with a special instruction, sp_instr_hreturn, which returns to this location. diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 5b8aa36ff0d..513f3671b5d 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -201,7 +201,7 @@ ALTERNATIVE_NAME("server" "mysql-server") ALTERNATIVE_NAME("test" "mysql-test") # Argh! Different distributions call packages differently, to be a drop-in -# replacement we have to fake distribution-speficic dependencies +# replacement we have to fake distribution-specificic dependencies IF(RPM MATCHES "(rhel|centos)6") ALTERNATIVE_NAME("client" "mysql") diff --git a/configure.cmake b/configure.cmake index 7258077d68b..b62ac12e634 100644 --- a/configure.cmake +++ b/configure.cmake @@ -488,7 +488,7 @@ int main() { # -# Test for endianess +# Test for endianness # INCLUDE(TestBigEndian) IF(APPLE) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index cc5b04188f4..1a709eb8284 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -33,7 +33,7 @@ fi # Look up distro-version specific stuff # # Always keep the actual packaging as up-to-date as possible following the latest -# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh +# Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh # tests for backwards compatibility and strip away parts on older builders. # If iproute2 is not available (before Debian Jessie and Ubuntu Trusty) diff --git a/debian/mariadb-server-10.3.mysql.init b/debian/mariadb-server-10.3.mysql.init index d7f6d58e8ca..35a52d5d8db 100644 --- a/debian/mariadb-server-10.3.mysql.init +++ b/debian/mariadb-server-10.3.mysql.init @@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -# priority can be overriden and "-s" adds output to stderr +# priority can be overridden and "-s" adds output to stderr ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" if [ -f /etc/default/mysql ]; then diff --git a/include/m_ctype.h b/include/m_ctype.h index b78443f88f8..da52b4c15a0 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -376,7 +376,7 @@ typedef size_t (*my_charset_conv_case)(CHARSET_INFO *, A structure to return the statistics of a native string copying, when no Unicode conversion is involved. - The stucture is OK to be unitialized before calling a copying routine. + The stucture is OK to be uninitialized before calling a copying routine. A copying routine must populate the structure as follows: - m_source_end_pos must be set by to a non-NULL value in the range of the input string. @@ -425,7 +425,7 @@ struct my_charset_handler_st my_charset_conv_case caseup; my_charset_conv_case casedn; - /* Charset dependant snprintf() */ + /* Charset dependent snprintf() */ size_t (*snprintf)(CHARSET_INFO *, char *to, size_t n, const char *fmt, ...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5); diff --git a/include/my_atomic.h b/include/my_atomic.h index 896dc2b5c33..1f5d85fcf12 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -101,7 +101,7 @@ sequentially-consistent operation ordering. We choose implementation as follows: on Windows using Visual C++ the native - implementation should be preferrable. When using gcc we prefer the Solaris + implementation should be preferable. When using gcc we prefer the Solaris implementation before the gcc because of stability preference, we choose gcc builtins if available. */ diff --git a/include/my_global.h b/include/my_global.h index 7986a0e21dd..a96c947cf44 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -178,7 +178,7 @@ /* The macros below are borrowed from include/linux/compiler.h in the - Linux kernel. Use them to indicate the likelyhood of the truthfulness + Linux kernel. Use them to indicate the likelihood of the truthfulness of a condition. This serves two purposes - newer versions of gcc will be able to optimize for branch predication, which could yield siginficant performance gains in frequently executed sections of the code, and the @@ -527,7 +527,7 @@ typedef SOCKET my_socket; typedef int my_socket; /* File descriptor for sockets */ #define INVALID_SOCKET -1 #endif -/* Type for fuctions that handles signals */ +/* Type for functions that handles signals */ #define sig_handler RETSIGTYPE C_MODE_START #ifdef HAVE_SIGHANDLER_T @@ -857,7 +857,7 @@ static inline double log2(double x) /* Max size that must be added to a so that we know Size to make - adressable obj. + addressable obj. */ #if SIZEOF_CHARP == 4 typedef long my_ptrdiff_t; @@ -869,7 +869,7 @@ typedef long long my_ptrdiff_t; #define MY_ALIGN_DOWN(A,L) ((A) & ~((L) - 1)) #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) #define ALIGN_MAX_UNIT (sizeof(double)) -/* Size to make adressable obj. */ +/* Size to make addressable obj. */ #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double))) #define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size) #define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B)) diff --git a/include/my_pthread.h b/include/my_pthread.h index 037ac0a062f..ecb201a60da 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -196,7 +196,7 @@ int sigwait(sigset_t *set, int *sig); #endif #if !defined(HAVE_SIGWAIT) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(_AIX) -int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ +int sigwait(sigset_t *setp, int *sigp); /* Use our implementation */ #endif @@ -393,7 +393,7 @@ typedef struct st_safe_mutex_deadlock_t #ifdef SAFE_MUTEX_DETECT_DESTROY /* - Used to track the destroying of mutexes. This needs to be a seperate + Used to track the destroying of mutexes. This needs to be a separate structure because the safe_mutex_t structure could be freed before the mutexes are destroyed. */ diff --git a/include/mysql/service_thd_rnd.h b/include/mysql/service_thd_rnd.h index 21133c7889f..13fc1c16839 100644 --- a/include/mysql/service_thd_rnd.h +++ b/include/mysql/service_thd_rnd.h @@ -18,7 +18,7 @@ @file This service provides access to the thd-local random number generator. - It's preferrable over the global one, because concurrent threads + It's preferable over the global one, because concurrent threads can generate random numbers without fighting each other over the access to the shared rnd state. */ diff --git a/include/mysql_com.h b/include/mysql_com.h index 71858c93046..7f445502228 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -152,7 +152,7 @@ enum enum_indicator_type */ #define SCRAMBLE_LENGTH 20 #define SCRAMBLE_LENGTH_323 8 -/* length of password stored in the db: new passwords are preceeded with '*' */ +/* length of password stored in the db: new passwords are preceded with '*' */ #define SCRAMBLED_PASSWORD_CHAR_LENGTH (SCRAMBLE_LENGTH*2+1) #define SCRAMBLED_PASSWORD_CHAR_LENGTH_323 (SCRAMBLE_LENGTH_323*2) @@ -288,7 +288,7 @@ enum enum_indicator_type #endif /* - Gather all possible capabilites (flags) supported by the server + Gather all possible capabilities (flags) supported by the server MARIADB_* flags supported only by MariaDB connector(s). */ diff --git a/man/mysql-test-run.pl.1 b/man/mysql-test-run.pl.1 index 93fb42e251a..b928ec66587 100644 --- a/man/mysql-test-run.pl.1 +++ b/man/mysql-test-run.pl.1 @@ -276,7 +276,7 @@ T}:T{ Setting of a timeout in minutes or seconds, corresponding to command line option \fB\-\-\fR\fB\fIname\fR\fR\fB\-timeout\fR\&. - Avaliable timeout names are TESTCASE, + Available timeout names are TESTCASE, SUITE (both in minutes) and START, SHUTDOWN (both in seconds)\&. These variables are supported from @@ -1350,7 +1350,7 @@ for a description\&. .\" noreorder option: mysql-test-run.pl \fB\-\-noreorder\fR .sp -Do not reorder tests to reduce number of restarts, but run them in exactly the order given\&. If a whole suite is to be run, the tests are run in alphabetical order, though similiar combinations will be grouped together\&. If more than one suite is listed, the tests are run one suite at a time, in the order listed\&. +Do not reorder tests to reduce number of restarts, but run them in exactly the order given\&. If a whole suite is to be run, the tests are run in alphabetical order, though similar combinations will be grouped together\&. If more than one suite is listed, the tests are run one suite at a time, in the order listed\&. .RE .sp .RS 4 diff --git a/man/mysql.1 b/man/mysql.1 index b7f7a63bff4..f925fee454b 100644 --- a/man/mysql.1 +++ b/man/mysql.1 @@ -698,7 +698,7 @@ the section called \(lqMYSQL COMMANDS\(rq\&. Disabled by default\&. .\} .\" mysql: net-buffer-length option .\" net-buffer-length option: mysql -\fB\-\-net\-buffer\-lenght=\fR\fB\fIsize\fR\fR +\fB\-\-net\-buffer\-length=\fR\fB\fIsize\fR\fR .sp Set the buffer size for TCP/IP and socket communication\&. (Default value is 16KB\&.) .RE diff --git a/mysys/my_atomic_writes.c b/mysys/my_atomic_writes.c index 0b54a207713..7f1e353c121 100644 --- a/mysys/my_atomic_writes.c +++ b/mysys/my_atomic_writes.c @@ -259,7 +259,7 @@ static my_bool shannon_has_atomic_write(File file, int page_size) ************************************************************************/ /* - Initalize automic write sub systems. + Initialize automic write sub systems. Checks if we have any devices that supports atomic write */ diff --git a/mysys/my_context.c b/mysys/my_context.c index cf10738bdbd..5423f59d19b 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -707,7 +707,7 @@ my_context_continue(struct my_context *c) { /* This seems to be a common trick to run ConvertThreadToFiber() only on the - first occurence in a thread, in a way that works on multiple Windows + first occurrence in a thread, in a way that works on multiple Windows versions. */ void *current_fiber= GetCurrentFiber(); diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 0ea062988f6..9e617366ed5 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -236,7 +236,7 @@ int handle_options(int *argc, char ***argv, { is_cmdline_arg= 1; - /* save the separator too if skip unkown options */ + /* save the separator too if skip unknown options */ if (my_getopt_skip_unknown) (*argv)[argvpos++]= cur_arg; else diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index 49cb3ea600f..268a2b80f63 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -240,7 +240,7 @@ int safe_mutex_lock(safe_mutex_t *mp, myf my_flags, const char *file, if (!mp->file) { fprintf(stderr, - "safe_mutex: Trying to lock unitialized mutex at %s, line %d\n", + "safe_mutex: Trying to lock uninitialized mutex at %s, line %d\n", file, line); fflush(stderr); abort(); @@ -585,7 +585,7 @@ int safe_mutex_destroy(safe_mutex_t *mp, const char *file, uint line) if (!mp->file) { fprintf(stderr, - "safe_mutex: Trying to destroy unitialized mutex at %s, line %d\n", + "safe_mutex: Trying to destroy uninitialized mutex at %s, line %d\n", file, line); fflush(stderr); abort(); diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index e3ed531df93..4386b6aa432 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -34034,7 +34034,7 @@ apply_one_rule(MY_CHARSET_LOADER *loader, /** Check if collation rules are valid, - i.e. characters are not outside of the collation suported range. + i.e. characters are not outside of the collation supported range. */ static int check_rules(MY_CHARSET_LOADER *loader, @@ -34170,7 +34170,7 @@ init_weight_level(MY_CHARSET_LOADER *loader, MY_COLL_RULES *rules, memcpy(dst->weights, src->weights, npages * sizeof(uint16 *)); /* - Calculate maximum lenghts for the pages which will be overwritten. + Calculate maximum lengths for the pages which will be overwritten. Mark pages that will be otherwriten as NULL. We'll allocate their own memory. */ @@ -34188,7 +34188,7 @@ init_weight_level(MY_CHARSET_LOADER *loader, MY_COLL_RULES *rules, { /* Not an expansion and not a contraction. - The page correspoding to r->curr[0] in "dst" + The page corresponding to r->curr[0] in "dst" will need at least the same amount of weights that r->base[0] has in "src". */ diff --git a/strings/decimal.c b/strings/decimal.c index 7db5111fc84..d7fd9a5722b 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1694,7 +1694,7 @@ done: scale increment for '/' NOTE - returned valued may be larger than the actual buffer requred + returned valued may be larger than the actual buffer required in the operation, as decimal_result_size, by design, operates on precision/scale values only and not on the actual decimal number diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index c0062ddcdd1..9803b0b07a2 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -524,7 +524,7 @@ LExit: or 4GB(x64 OS). Fragmentation due to loaded modules, heap and stack - limit maximum size of continous memory block further, + limit maximum size of continuous memory block further, so that limit for 32 bit process is about 1200 on 32 bit OS or 2000 MB on 64 bit OS(found experimentally). */ |