From f107cb709871414f1f59f21e718d6ba2bc7d2c4b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Mar 2004 01:48:46 +0200 Subject: [PATCH] Don't change server suffix if given to configure Portability fixes client/mysqltest.c: Fixed output of 'affected rows' innobase/os/os0file.c: Portability fix (for AIX) mysql-test/r/rpl_trunc_binlog.result: Update results after merge sql/mysqld.cc: Don't change server suffix if given to configure --- client/mysqltest.c | 2 +- innobase/os/os0file.c | 5 +++-- mysql-test/r/rpl_trunc_binlog.result | 2 +- sql/mysqld.cc | 7 ++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 4e97863f97b..ed4840cf809 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2345,7 +2345,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) if (!disable_info) { char buf[40]; - sprintf(buf,"affected rows: %ld\n",mysql_affected_rows(mysql)); + sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql)); dynstr_append(ds, buf); if (mysql_info(mysql)) { diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 1f70cf883e7..86a71f142fb 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -6,8 +6,6 @@ The interface to the operating system file i/o primitives Created 10/21/1995 Heikki Tuuri *******************************************************/ -#include - #include "os0file.h" #include "os0sync.h" #include "os0thread.h" @@ -17,6 +15,9 @@ Created 10/21/1995 Heikki Tuuri #include "fil0fil.h" #include "buf0buf.h" +#include +#include + #undef HAVE_FDATASYNC #ifdef POSIX_ASYNC_IO diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index 39b754dec47..ad0fb9e5022 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -10,4 +10,4 @@ reset slave; start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 slave-relay-bin.000002 123 master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 326 None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 slave-relay-bin.000002 123 master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log. 0 79 326 None 0 No # diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6d14e079eb6..fc50b8c5c6e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2104,10 +2104,11 @@ static int init_common_variables(const char *conf_file_name, int argc, strmov(fn_ext(pidfile_name),".pid"); // Add proper extension #ifndef DBUG_OFF - strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS); -#else - strmov(strend(server_version),MYSQL_SERVER_SUFFIX); + if (*(MYSQL_SERVER_SUFFIX)) + strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS); + else #endif + strmov(strend(server_version),MYSQL_SERVER_SUFFIX); load_defaults(conf_file_name, groups, &argc, &argv); defaults_argv=argv;