1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixes to PB failiurs

mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result:
  Uodated result file
mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test:
  Added code to explain the failiure
mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test:
  Added code to handle diff result outpt in windows (dll vs. so)
This commit is contained in:
Omer BarNir
2010-02-03 09:11:16 -08:00
parent 013dcdbd67
commit e9da37b6e7
9 changed files with 22 additions and 3 deletions

View File

@ -1,8 +1,11 @@
select @@global.pseudo_thread_id; select @@global.pseudo_thread_id;
ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable
select @@session.pseudo_thread_id between 1 and 1000; select @@session.pseudo_thread_id between 1 and 10000;
@@session.pseudo_thread_id between 1 and 1000 @@session.pseudo_thread_id between 1 and 10000
1 1
select @@session.pseudo_thread_id;
@@session.pseudo_thread_id
2
should be empty should be empty
show global variables like 'pseudo_thread_id'; show global variables like 'pseudo_thread_id';
Variable_name Value Variable_name Value

View File

@ -24,7 +24,10 @@
if (`SELECT @@have_dynamic_loading = 'YES' AND LENGTH('$SEMISYNC_MASTER_PLUGIN') > 0`) if (`SELECT @@have_dynamic_loading = 'YES' AND LENGTH('$SEMISYNC_MASTER_PLUGIN') > 0`)
{ {
--disable_query_log --disable_query_log
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
--enable_query_log --enable_query_log
} }

View File

@ -10,7 +10,8 @@
select @@global.pseudo_thread_id; select @@global.pseudo_thread_id;
# Check the variable has a valid numeric value (assumed to be less then 10000) # Check the variable has a valid numeric value (assumed to be less then 10000)
select @@session.pseudo_thread_id between 1 and 1000; select @@session.pseudo_thread_id between 1 and 10000;
select @@session.pseudo_thread_id;
--echo should be empty --echo should be empty
show global variables like 'pseudo_thread_id'; show global variables like 'pseudo_thread_id';

View File

@ -6,6 +6,8 @@
# #
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
select @@global.rpl_semi_sync_master_enabled; select @@global.rpl_semi_sync_master_enabled;
SET @start_global_value = @@global.rpl_semi_sync_master_enabled; SET @start_global_value = @@global.rpl_semi_sync_master_enabled;

View File

@ -5,6 +5,8 @@
# 2010-01-21 OBN - Added # 2010-01-21 OBN - Added
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
select @@global.rpl_semi_sync_master_timeout; select @@global.rpl_semi_sync_master_timeout;
SET @start_global_value = @@global.rpl_semi_sync_master_timeout; SET @start_global_value = @@global.rpl_semi_sync_master_timeout;

View File

@ -5,6 +5,8 @@
# 2010-01-21 OBN - Added # 2010-01-21 OBN - Added
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
select @@global.rpl_semi_sync_master_trace_level; select @@global.rpl_semi_sync_master_trace_level;
SET @start_global_value = @@global.rpl_semi_sync_master_trace_level; SET @start_global_value = @@global.rpl_semi_sync_master_trace_level;

View File

@ -6,6 +6,8 @@
# #
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
select @@global.rpl_semi_sync_master_wait_no_slave; select @@global.rpl_semi_sync_master_wait_no_slave;
SET @start_global_value = @@global.rpl_semi_sync_master_wait_no_slave; SET @start_global_value = @@global.rpl_semi_sync_master_wait_no_slave;

View File

@ -6,6 +6,8 @@
# #
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
select @@global.rpl_semi_sync_slave_enabled; select @@global.rpl_semi_sync_slave_enabled;
SET @start_global_value = @@global.rpl_semi_sync_slave_enabled; SET @start_global_value = @@global.rpl_semi_sync_slave_enabled;

View File

@ -5,6 +5,8 @@
# 2010-01-21 OBN - Added # 2010-01-21 OBN - Added
# #
source include/have_semisync_plugin.inc; source include/have_semisync_plugin.inc;
# The following is to prevent a mis-match on windows that has the name of of the lib ending with 'dll'
--replace_regex /\.dll/.so/
eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN'; eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
select @@global.rpl_semi_sync_slave_trace_level; select @@global.rpl_semi_sync_slave_trace_level;
SET @start_global_value = @@global.rpl_semi_sync_slave_trace_level; SET @start_global_value = @@global.rpl_semi_sync_slave_trace_level;