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

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
parent a49f5525bb 7841a7eb09
commit ae6bdc6769
345 changed files with 7745 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage/connect/myconn.cpp
View File

@@ -35,11 +35,11 @@
#include "my_sys.h"
#include "mysqld_error.h"
#endif // !MYSQL_PREPARED_STATEMENTS
#if defined(__WIN__)
#if defined(_WIN32)
//#include <windows.h>
#else // !__WIN__
#else // !_WIN32
#include "osutil.h"
#endif // !__WIN__
#endif // !_WIN32
#include "global.h"
#include "plgdbsem.h"
@@ -492,15 +492,15 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db,
//mysql_options(m_DB, MYSQL_OPT_READ_TIMEOUT, &nrt);
//mysql_options(m_DB, MYSQL_OPT_WRITE_TIMEOUT, ...);
#if defined(__WIN__)
#if defined(_WIN32)
if (!strcmp(host, ".")) {
mysql_options(m_DB, MYSQL_OPT_NAMED_PIPE, NULL);
pipe = mysqld_unix_port;
} // endif host
#else // !__WIN__
#else // !_WIN32
if (!strcmp(host, "localhost"))
pipe = mysqld_unix_port;
#endif // !__WIN__
#endif // !_WIN32
#if 0
if (pwd && !strcmp(pwd, "*")) {