diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-04-02 11:20:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-04-02 11:20:09 +0200 |
| commit | 3b03f5d97e0f80da74cb0789f513ce0319fc9c8a (patch) | |
| tree | 2655536b4631ad6a1894a274ff1da4ae9f408fb7 /sql | |
| parent | c7d173589c4e8f8332495228c6000f3fa0505e1e (diff) | |
| download | mariadb-git-3b03f5d97e0f80da74cb0789f513ce0319fc9c8a.tar.gz | |
fixes for windows builds
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/client_settings.h | 1 | ||||
| -rw-r--r-- | sql/log_event.cc | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 4 |
5 files changed, 4 insertions, 8 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index ed1e8d67cfe..850903a24e5 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -29,7 +29,6 @@ #define mysql_master_send_query(A, B, C) 1 #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 -#undef HAVE_SMEM #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() diff --git a/sql/log_event.cc b/sql/log_event.cc index 62520246d21..43ea6dfcfed 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1716,8 +1716,7 @@ beg: case MYSQL_TYPE_DATETIME: { - size_t d, t; - uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ + uint64 d, t, i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ d= i64 / 1000000; t= i64 % 1000000; my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d", diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 77ff063eb54..f991cceb3fd 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6645,8 +6645,6 @@ Can't be set to 1 if --log-slave-updates is used.", {"shared-memory", OPT_ENABLE_SHARED_MEMORY, "Enable the shared memory.",(uchar**) &opt_enable_shared_memory, (uchar**) &opt_enable_shared_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#endif -#ifdef HAVE_SMEM {"shared-memory-base-name",OPT_SHARED_MEMORY_BASE_NAME, "Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 593d1e68af0..656d9e03b71 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -924,7 +924,7 @@ void THD::update_stats(void) /* A SQL query. */ if (lex->sql_command == SQLCOM_SELECT) select_commands++; - else if (! sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) + else if (! (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)) { /* Ignore 'SHOW ' commands */ } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4eca294b60b..6e991eba2f8 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2529,8 +2529,8 @@ int send_user_stats(THD* thd, HASH *all_user_stats, TABLE *table) table->field[j++]->store(user_stats->user, user_stats->user_name_length, system_charset_info); table->field[j++]->store((longlong)user_stats->total_connections,TRUE); - table->field[j++]->store((longlong)user_stats->concurrent_connections); - table->field[j++]->store((longlong)user_stats->connected_time); + table->field[j++]->store((longlong)user_stats->concurrent_connections, TRUE); + table->field[j++]->store((longlong)user_stats->connected_time, TRUE); table->field[j++]->store((double)user_stats->busy_time); table->field[j++]->store((double)user_stats->cpu_time); table->field[j++]->store((longlong)user_stats->bytes_received, TRUE); |