summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 14:38:27 +0200
commitd54510716e3ed1c497eb45338dbc47dfd0c2d0b2 (patch)
tree94a3351755f524f29f7931ba33fbc9438132a82f /include/my_global.h
parentfb41117c907a99d051ac09c229762978373d7eb0 (diff)
parente51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff)
downloadmariadb-git-10.4-MDEV-29988-merge.tar.gz
WIP merge 10.3 into 10.410.4-MDEV-29988-merge
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b60fa59dfaa..1e1821e2f25 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -670,7 +670,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
the mismatch of CRT and mysys file IO usage on Windows at runtime.
CRT file descriptors can be in the range 0-2047, whereas descriptors returned
by my_open() will start with 2048. If a file descriptor with value less then
- MY_FILE_MIN is passed to mysys IO function, chances are it stemms from
+ MY_FILE_MIN is passed to mysys IO function, chances are it stems from
open()/fileno() and not my_open()/my_fileno.
For Posix, mysys functions are light wrappers around libc, and MY_FILE_MIN
@@ -891,7 +891,7 @@ typedef long long my_ptrdiff_t;
#define STDCALL
#endif
-/* Typdefs for easyier portability */
+/* Typdefs for easier portability */
#ifndef HAVE_UCHAR
typedef unsigned char uchar; /* Short for unsigned char */