mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fixed compiler warnings and some test failures found by buildbot
dbug/dbug.c: Fixed compiler warnings on windows mysql-test/r/index_intersect_innodb.result: Don't print number of rows as this varies mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Update to use new State mysql-test/suite/handler/heap.result: Update results mysql-test/suite/handler/heap.test: Changed key used in test as the key 'b' will not guarantee order of the two last elements (as the key value is the same) mysql-test/suite/pbxt/r/lock_multi.result: Update to use new State mysql-test/t/index_intersect.test: Don't print number of rows as this varies mysql-test/valgrind.supp: Added suppression for linux mysys/hash.c: Fixed compiler warnings on windows plugin/handler_socket/handlersocket/database.cpp: Fixed compiler warnings sql-common/client_plugin.c: Changed variable to define to avoid compiler warnings when variable is not used sql-common/my_time.c: Initialize all my_time elements to avoid compiler warnings storage/oqgraph/ha_oqgraph.cc: Use right function (to avoid compiler warning) storage/pbxt/src/table_xt.cc: Initialize variables (to avoid compiler warnings)
This commit is contained in:
@ -246,7 +246,7 @@ wait_server_to_start(THD *thd, volatile int& shutdown_flag)
|
||||
DBG_SHUT(fprintf(stderr, "HNDSOCK wsts\n"));
|
||||
pthread_mutex_lock(&LOCK_server_started);
|
||||
while (!mysqld_server_started) {
|
||||
timespec abstime = { };
|
||||
timespec abstime;
|
||||
set_timespec(abstime, 1);
|
||||
pthread_cond_timedwait(&COND_server_started, &LOCK_server_started,
|
||||
&abstime);
|
||||
@ -287,8 +287,7 @@ dbcontext::init_thread(const void *stack_bottom, volatile int& shutdown_flag)
|
||||
thd->thread_stack, sizeof(THD), of));
|
||||
thd->store_globals();
|
||||
thd->system_thread = static_cast<enum_thread_type>(1<<30UL);
|
||||
const NET v = { 0 };
|
||||
thd->net = v;
|
||||
memset(&thd->net, 0, sizeof(thd->net));
|
||||
if (for_write_flag) {
|
||||
#if MYSQL_VERSION_ID >= 50505
|
||||
thd->variables.option_bits |= OPTION_BIN_LOG;
|
||||
|
Reference in New Issue
Block a user