Merge branch '10.9' into bb-10.9-release

MariaDB · Nov 7, 2022 · c18a57a · c18a57a
2 parents acf8dc0 + 677b22b
commit c18a57a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=9
-MYSQL_VERSION_PATCH=4
+MYSQL_VERSION_PATCH=5
 SERVER_MATURITY=stable
diff --git a/extra/comp_err.c b/extra/comp_err.c
@@ -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)))

diff --git a/include/my_global.h b/include/my_global.h
@@ -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

diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
@@ -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';