mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-19 14:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.9' into bb-10.9-release

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-11-07 19:16:32 +01:00
commit c18a57ab2a
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=9
MYSQL_VERSION_PATCH=4
MYSQL_VERSION_PATCH=5
SERVER_MATURITY=stable

2
extra/comp_err.c
View file

@ -494,7 +494,7 @@ static uint parse_input_file(const char *file_name, struct errors **top_error,
section_start= er_offset;
section_count= 0;
if (!(file= my_fopen(file_name, O_RDONLY | O_SHARE, MYF(MY_WME))))
if (!(file= my_fopen(file_name, O_RDONLY | O_TEXT | O_SHARE, MYF(MY_WME))))
DBUG_RETURN(0);
while ((str= fgets(buff, sizeof(buff), file)))

3
include/my_global.h
View file

@ -598,6 +598,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
#else
#define HAVE_SOCK_CLOEXEC
#endif
#ifndef O_TEXT
#define O_TEXT 0
#endif
/* additional file share flags for win32 */
#ifdef _WIN32

2
mysys/my_fopen.c
View file

@ -291,6 +291,8 @@ static void make_ftype(register char * to, register int flag)
if (flag & FILE_BINARY)
*to++='b';
else if (flag & O_TEXT)
*to++= 't';
if (O_CLOEXEC)
*to++= 'e';