summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-10 14:50:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-10 14:50:58 +0200
commit820ebcec8651d2478ece554f059a5513f0b2bedf (patch)
tree2a4b43a9f104782fa9211e8622bc7d50a992f802 /include/my_global.h
parent0225159a8d0e1260bfec7219b584523097a74d4b (diff)
parent92c8d6f168f329bf7e3998a4f580781d0239b59a (diff)
downloadmariadb-git-820ebcec8651d2478ece554f059a5513f0b2bedf.tar.gz
Merge 10.8 into 10.9
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 6b4ed7dbfcc..38bee0163ad 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -645,7 +645,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
@@ -868,7 +868,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 */