Skip to content

Commit c9c28be

Browse files
ottokcvicentiu
authored andcommitted
Minor spelling fixes in code comments, docs and output
This commit does not touch any variable names or any other actual code, and thus should not in any way affect how the code works.
1 parent 21239bb commit c9c28be

21 files changed

+32
-32
lines changed

BUILD-CMAKE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ shell>cd ../build
9797
shell>cmake ../src
9898

9999
Note: if a directory was used for in-source build, out-of-source will
100-
not work. To reenable out-of-source build, remove <source-root>/CMakeCache.txt
100+
not work. To re-enable out-of-source build, remove <source-root>/CMakeCache.txt
101101
file.
102102

103103

Docs/sp-imp-spec.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
One "obvious" solution would be to simply push "mysql.proc" to the list
324324
of tables used by the query, but this implies a "join" with this table
325325
if the query is a select, so it doesn't work (and we can't exclude this
326-
table easily; since a priviledged used might in fact want to search
326+
table easily; since a privileged used might in fact want to search
327327
the proc table).
328328
Another solution would of course be to allow the opening and closing
329329
of the mysql.proc table during a query execution, but this it not
@@ -400,7 +400,7 @@
400400
instruction.
401401

402402
Calling and returning from a CONTINUE handler poses some special
403-
problems. Since we need to return to the point after its invokation,
403+
problems. Since we need to return to the point after its invocation,
404404
we push the return location on a stack in the sp_rcontext (this is
405405
done by the exectution loop). The handler then ends with a special
406406
instruction, sp_instr_hreturn, which returns to this location.

cmake/cpack_rpm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ ALTERNATIVE_NAME("server" "mysql-server")
201201
ALTERNATIVE_NAME("test" "mysql-test")
202202

203203
# Argh! Different distributions call packages differently, to be a drop-in
204-
# replacement we have to fake distribution-speficic dependencies
204+
# replacement we have to fake distribution-specificic dependencies
205205

206206
IF(RPM MATCHES "(rhel|centos)6")
207207
ALTERNATIVE_NAME("client" "mysql")

configure.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ int main() {
488488

489489

490490
#
491-
# Test for endianess
491+
# Test for endianness
492492
#
493493
INCLUDE(TestBigEndian)
494494
IF(APPLE)

debian/autobake-deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
# Look up distro-version specific stuff
3434
#
3535
# Always keep the actual packaging as up-to-date as possible following the latest
36-
# Debian policy and targetting Debian Sid. Then case-by-case run in autobake-deb.sh
36+
# Debian policy and targeting Debian Sid. Then case-by-case run in autobake-deb.sh
3737
# tests for backwards compatibility and strip away parts on older builders.
3838

3939
# If iproute2 is not available (before Debian Jessie and Ubuntu Trusty)

debian/mariadb-server-10.3.mysql.init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
2525

2626
MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
2727

28-
# priority can be overriden and "-s" adds output to stderr
28+
# priority can be overridden and "-s" adds output to stderr
2929
ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i"
3030

3131
if [ -f /etc/default/mysql ]; then

include/m_ctype.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ typedef size_t (*my_charset_conv_case)(CHARSET_INFO *,
376376
A structure to return the statistics of a native string copying,
377377
when no Unicode conversion is involved.
378378
379-
The stucture is OK to be unitialized before calling a copying routine.
379+
The stucture is OK to be uninitialized before calling a copying routine.
380380
A copying routine must populate the structure as follows:
381381
- m_source_end_pos must be set by to a non-NULL value
382382
in the range of the input string.
@@ -425,7 +425,7 @@ struct my_charset_handler_st
425425
my_charset_conv_case caseup;
426426
my_charset_conv_case casedn;
427427

428-
/* Charset dependant snprintf() */
428+
/* Charset dependent snprintf() */
429429
size_t (*snprintf)(CHARSET_INFO *, char *to, size_t n,
430430
const char *fmt,
431431
...) ATTRIBUTE_FORMAT_FPTR(printf, 4, 5);

include/my_atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
sequentially-consistent operation ordering.
102102
103103
We choose implementation as follows: on Windows using Visual C++ the native
104-
implementation should be preferrable. When using gcc we prefer the Solaris
104+
implementation should be preferable. When using gcc we prefer the Solaris
105105
implementation before the gcc because of stability preference, we choose gcc
106106
builtins if available.
107107
*/

include/my_global.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178

179179
/*
180180
The macros below are borrowed from include/linux/compiler.h in the
181-
Linux kernel. Use them to indicate the likelyhood of the truthfulness
181+
Linux kernel. Use them to indicate the likelihood of the truthfulness
182182
of a condition. This serves two purposes - newer versions of gcc will be
183183
able to optimize for branch predication, which could yield siginficant
184184
performance gains in frequently executed sections of the code, and the
@@ -527,7 +527,7 @@ typedef SOCKET my_socket;
527527
typedef int my_socket; /* File descriptor for sockets */
528528
#define INVALID_SOCKET -1
529529
#endif
530-
/* Type for fuctions that handles signals */
530+
/* Type for functions that handles signals */
531531
#define sig_handler RETSIGTYPE
532532
C_MODE_START
533533
#ifdef HAVE_SIGHANDLER_T
@@ -857,7 +857,7 @@ static inline double log2(double x)
857857

858858
/*
859859
Max size that must be added to a so that we know Size to make
860-
adressable obj.
860+
addressable obj.
861861
*/
862862
#if SIZEOF_CHARP == 4
863863
typedef long my_ptrdiff_t;
@@ -869,7 +869,7 @@ typedef long long my_ptrdiff_t;
869869
#define MY_ALIGN_DOWN(A,L) ((A) & ~((L) - 1))
870870
#define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double))
871871
#define ALIGN_MAX_UNIT (sizeof(double))
872-
/* Size to make adressable obj. */
872+
/* Size to make addressable obj. */
873873
#define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A), sizeof(double)))
874874
#define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
875875
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))

include/my_pthread.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ int sigwait(sigset_t *set, int *sig);
196196
#endif
197197

198198
#if !defined(HAVE_SIGWAIT) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(_AIX)
199-
int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
199+
int sigwait(sigset_t *setp, int *sigp); /* Use our implementation */
200200
#endif
201201

202202

@@ -393,7 +393,7 @@ typedef struct st_safe_mutex_deadlock_t
393393

394394
#ifdef SAFE_MUTEX_DETECT_DESTROY
395395
/*
396-
Used to track the destroying of mutexes. This needs to be a seperate
396+
Used to track the destroying of mutexes. This needs to be a separate
397397
structure because the safe_mutex_t structure could be freed before
398398
the mutexes are destroyed.
399399
*/

0 commit comments

Comments
 (0)