From e9da37b6e77fee90f3925fedc722967d09ba8d64 Mon Sep 17 00:00:00 2001 From: Omer BarNir Date: Wed, 3 Feb 2010 09:11:16 -0800 Subject: [PATCH] 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) --- mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result | 7 +++++-- mysql-test/suite/sys_vars/t/all_vars.test | 3 +++ mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test | 3 ++- .../sys_vars/t/rpl_semi_sync_master_enabled_basic.test | 2 ++ .../sys_vars/t/rpl_semi_sync_master_timeout_basic.test | 2 ++ .../sys_vars/t/rpl_semi_sync_master_trace_level_basic.test | 2 ++ .../t/rpl_semi_sync_master_wait_no_slave_basic.test | 2 ++ .../sys_vars/t/rpl_semi_sync_slave_enabled_basic.test | 2 ++ .../sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test | 2 ++ 9 files changed, 22 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result b/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result index 6b0a8899560..4457d2a0075 100644 --- a/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result +++ b/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result @@ -1,8 +1,11 @@ select @@global.pseudo_thread_id; ERROR HY000: Variable 'pseudo_thread_id' is a SESSION variable -select @@session.pseudo_thread_id between 1 and 1000; -@@session.pseudo_thread_id between 1 and 1000 +select @@session.pseudo_thread_id between 1 and 10000; +@@session.pseudo_thread_id between 1 and 10000 1 +select @@session.pseudo_thread_id; +@@session.pseudo_thread_id +2 should be empty show global variables like 'pseudo_thread_id'; Variable_name Value diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test index 0e831319898..e9e7e16687a 100644 --- a/mysql-test/suite/sys_vars/t/all_vars.test +++ b/mysql-test/suite/sys_vars/t/all_vars.test @@ -24,7 +24,10 @@ if (`SELECT @@have_dynamic_loading = 'YES' AND LENGTH('$SEMISYNC_MASTER_PLUGIN') > 0`) { --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'; + --replace_regex /\.dll/.so/ eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN'; --enable_query_log } diff --git a/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test b/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test index 0722b42099d..4f5e7bcf23e 100644 --- a/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test +++ b/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test @@ -10,7 +10,8 @@ select @@global.pseudo_thread_id; # 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 show global variables like 'pseudo_thread_id'; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test index 5aea6e165ea..749695e035c 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test @@ -6,6 +6,8 @@ # # 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'; select @@global.rpl_semi_sync_master_enabled; SET @start_global_value = @@global.rpl_semi_sync_master_enabled; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test index 6c4aae8e3bf..16389c23d54 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test @@ -5,6 +5,8 @@ # 2010-01-21 OBN - Added # 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'; select @@global.rpl_semi_sync_master_timeout; SET @start_global_value = @@global.rpl_semi_sync_master_timeout; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test index c37248ffa9a..c23aa1da688 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test @@ -5,6 +5,8 @@ # 2010-01-21 OBN - Added # 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'; select @@global.rpl_semi_sync_master_trace_level; SET @start_global_value = @@global.rpl_semi_sync_master_trace_level; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test index a90024b8961..9686a0e0d9a 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test @@ -6,6 +6,8 @@ # # 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'; select @@global.rpl_semi_sync_master_wait_no_slave; SET @start_global_value = @@global.rpl_semi_sync_master_wait_no_slave; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test index 5dca63d5e2d..0bb16cfd38e 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test @@ -6,6 +6,8 @@ # # 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'; select @@global.rpl_semi_sync_slave_enabled; SET @start_global_value = @@global.rpl_semi_sync_slave_enabled; diff --git a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test index afac5244eb2..2bdf09f2a7f 100644 --- a/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test +++ b/mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test @@ -5,6 +5,8 @@ # 2010-01-21 OBN - Added # 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'; select @@global.rpl_semi_sync_slave_trace_level; SET @start_global_value = @@global.rpl_semi_sync_slave_trace_level;