diff options
| author | unknown <monty@mysql.com> | 2003-11-22 03:21:40 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-22 03:21:40 +0200 |
| commit | 2ca3072548908466ec9ecf3bb514af52f34f5763 (patch) | |
| tree | f843dfed18127f94f90e6cffa6456e545f7b6b57 /sql-common | |
| parent | 20eba3e0b9f2fad7c0cff700f96315fe7aa8ccb7 (diff) | |
| download | mariadb-git-2ca3072548908466ec9ecf3bb514af52f34f5763.tar.gz | |
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
VC++Files/client/mysql.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/comp_err/comp_err.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/innobase/innobase.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamchk/myisamchk.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamlog/myisamlog.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisampack/myisampack.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysys/mysys.dsp:
Updated project files for windows according to suggestions from Intel
libmysql/libmysql.c:
Removed not used include files (which caused problems on Win64)
mysql-test/r/rpl_change_master.result:
Made test portable
mysql-test/t/rpl_change_master.test:
Made test portable
sql-common/client.c:
Removed not used include files (which caused problems on Win64)
sql/ha_innodb.cc:
Ensure that mutex is not freed if not initilized
sql/hostname.cc:
Ensure that mutex is not freed if not initilized
sql/slave.cc:
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index cb0d8230eb8..878a8beacba 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -55,12 +55,6 @@ my_bool net_flush(NET *net); #else /*EMBEDDED_LIBRARY*/ #define CLI_MYSQL_REAL_CONNECT mysql_real_connect #endif /*EMBEDDED_LIBRARY*/ - -#if !defined(MYSQL_SERVER) && (defined(__WIN__) || defined(_WIN32) || defined(_WIN64)) - -#include <winsock.h> -#include <odbcinst.h> -#endif /* !defined(MYSQL_SERVER) && (defined(__WIN__) ... */ #include <my_sys.h> #include <mysys_err.h> #include <m_string.h> |