Commit de22cd3f authored by Monty's avatar Monty

Fixes for failures in test scripts and removal of some compiler warnings

- rpl_gtid_stop_start:  Random failure
- sysvars_innodb,32bit: Fixes for 32 bit
parent bf95970e
...@@ -8,6 +8,7 @@ include/stop_slave.inc ...@@ -8,6 +8,7 @@ include/stop_slave.inc
Master_Log_File = 'master-bin.000001' Master_Log_File = 'master-bin.000001'
Using_Gtid = 'No' Using_Gtid = 'No'
CHANGE MASTER TO master_use_gtid=current_pos; CHANGE MASTER TO master_use_gtid=current_pos;
FLUSH LOGS;
connection server_1; connection server_1;
FLUSH LOGS; FLUSH LOGS;
include/wait_for_purge.inc "master-bin.000002" include/wait_for_purge.inc "master-bin.000002"
......
...@@ -28,6 +28,7 @@ CHANGE MASTER TO master_use_gtid=current_pos; ...@@ -28,6 +28,7 @@ CHANGE MASTER TO master_use_gtid=current_pos;
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect --write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
wait wait
EOF EOF
FLUSH LOGS;
--shutdown_server 30 --shutdown_server 30
--source include/wait_until_disconnected.inc --source include/wait_until_disconnected.inc
......
...@@ -2410,8 +2410,9 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, ...@@ -2410,8 +2410,9 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
} }
} }
} }
DBUG_ASSERT((table_check_constraints - share->check_constraints) == DBUG_ASSERT((uint) (table_check_constraints - share->check_constraints) ==
share->table_check_constraints - share->field_check_constraints); (uint) (share->table_check_constraints -
share->field_check_constraints));
if (options) if (options)
{ {
......
...@@ -4790,7 +4790,7 @@ lock_table( ...@@ -4790,7 +4790,7 @@ lock_table(
lock_mutex_enter(); lock_mutex_enter();
DBUG_EXECUTE_IF("fatal-semaphore-timeout", DBUG_EXECUTE_IF("fatal-semaphore-timeout",
{ os_thread_sleep(3600000000); }); { os_thread_sleep(3600000000LL); });
/* We have to check if the new lock is compatible with any locks /* We have to check if the new lock is compatible with any locks
other transactions have in the table lock queue. */ other transactions have in the table lock queue. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment