database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-27142 - fix Connect engine reliance on textmode stdio on Windows...

Browse Source 
by removing a couple ifdef(_WIN32)
This commit is contained in:
Vladislav Vaintroub
2022-02-03 01:24:14 +01:00
parent 016dd21371
commit a5dc76a051
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/json.cpp
View File

@@ -23,10 +23,8 @@
#define ARGS MY_MIN(24,(int)len-i),s+MY_MAX(i-3,0) #define ARGS MY_MIN(24,(int)len-i),s+MY_MAX(i-3,0)
#if defined(_WIN32) #define EL "\n"
#define EL "\r\n" #if !defined(_WIN32)
#else
#define EL "\n"
#undef SE_CATCH // Does not work for Linux #undef SE_CATCH // Does not work for Linux
#endif #endif

13
storage/connect/tabmul.cpp
View File

@@ -199,23 +199,16 @@ bool TDBMUL::InitFileNames(PGLOBAL g)
p = filename + strlen(filename) - 1; p = filename + strlen(filename) - 1;
#if !defined(_WIN32)
// Data files can be imported from Windows (having CRLF) // Data files can have CRLF
if (*p == '\n' || *p == '\r') { if (*p == '\n' || *p == '\r') {
// is this enough for Unix ???
p--; // Eliminate ending CR or LF character p--; // Eliminate ending CR or LF character
if (p >= filename) if (p >= filename)
// is this enough for Unix ???
if (*p == '\n' || *p == '\r') if (*p == '\n' || *p == '\r')
p--; // Eliminate ending CR or LF character p--; // Eliminate ending CR or LF character
} // endif p } // endif p
#else
if (*p == '\n')
p--; // Eliminate ending new-line character
#endif
// Trim rightmost blanks // Trim rightmost blanks
for (; p >= filename && *p == ' '; p--) ; for (; p >= filename && *p == ' '; p--) ;