diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 17:08:42 +0200 |
| commit | 8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (patch) | |
| tree | 3e2c81b24b86a194243fe3e7913393e96de99991 /include/my_global.h | |
| parent | c4938eafc594d6d64e5a17be13c337ada0beb63d (diff) | |
| parent | fb0808c450849e00993fa38839f33969a9daf7e8 (diff) | |
| download | mariadb-git-8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d9417c957c..586b3f7c59c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -630,7 +630,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 @@ -853,7 +853,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 */ |