Below is the list of changes that have just been committed into a local
6.0 repository of davi. When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-05-14 20:24:13-03:00, davi@stripped +19 -0
Miscellaneous post main merge fixes.
mysql-test/r/rpl_slave-running.result@stripped, 2008-05-14 19:57:59-03:00, davi@stripped +0
-0
Rename: mysql-test/r/slave-running.result -> mysql-test/r/rpl_slave-running.result
mysql-test/r/rpl_slave-stopped.result@stripped, 2008-05-14 19:57:59-03:00, davi@stripped +0
-0
Rename: mysql-test/r/slave-stopped.result -> mysql-test/r/rpl_slave-stopped.result
mysql-test/r/rpl_slave_allow_batching_basic.result@stripped, 2008-05-14 19:57:59-03:00,
davi@stripped +0 -0
Rename: mysql-test/r/slave_allow_batching_basic.result ->
mysql-test/r/rpl_slave_allow_batching_basic.result
mysql-test/r/rpl_slave_compressed_protocol_basic.result@stripped, 2008-05-14 19:57:59-03:00,
davi@stripped +0 -0
Rename: mysql-test/r/slave_compressed_protocol_basic.result ->
mysql-test/r/rpl_slave_compressed_protocol_basic.result
mysql-test/r/rpl_slave_exec_mode_basic.result@stripped, 2008-05-14 19:58:00-03:00,
davi@stripped +0 -0
Rename: mysql-test/r/slave_exec_mode_basic.result ->
mysql-test/r/rpl_slave_exec_mode_basic.result
mysql-test/r/rpl_slave_net_timeout_basic.result@stripped, 2008-05-14 19:58:00-03:00,
davi@stripped +0 -0
Rename: mysql-test/r/slave_net_timeout_basic.result ->
mysql-test/r/rpl_slave_net_timeout_basic.result
mysql-test/r/rpl_slave_transaction_retries_basic_32.result@stripped, 2008-05-14
19:58:00-03:00, davi@stripped +0 -0
Rename: mysql-test/r/slave_transaction_retries_basic_32.result ->
mysql-test/r/rpl_slave_transaction_retries_basic_32.result
mysql-test/r/rpl_slave_transaction_retries_basic_64.result@stripped, 2008-05-14
19:58:00-03:00, davi@stripped +0 -0
Rename: mysql-test/r/slave_transaction_retries_basic_64.result ->
mysql-test/r/rpl_slave_transaction_retries_basic_64.result
mysql-test/r/slow_query_log_file_basic.result@stripped, 2008-05-14 20:24:08-03:00,
davi@stripped +2 -1
Post merge fix, update test case result.
mysql-test/r/variables.result@stripped, 2008-05-14 20:24:08-03:00, davi@stripped +2 -0
Post merge fix, update test case result.
mysql-test/suite/binlog/r/binlog_innodb.result@stripped, 2008-05-14 20:24:08-03:00,
davi@stripped +4 -4
Update test case result
mysql-test/suite/binlog/t/binlog_innodb.test@stripped, 2008-05-14 20:24:08-03:00,
davi@stripped +1 -0
Reset session values to zero so that test can be deterministic.
mysql-test/t/rpl_slave_allow_batching_basic.test@stripped, 2008-05-14 19:57:17-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_allow_batching_basic.test ->
mysql-test/t/rpl_slave_allow_batching_basic.test
mysql-test/t/rpl_slave_compressed_protocol_basic.test@stripped, 2008-05-14 19:57:18-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_compressed_protocol_basic.test ->
mysql-test/t/rpl_slave_compressed_protocol_basic.test
mysql-test/t/rpl_slave_exec_mode_basic.test@stripped, 2008-05-14 19:57:18-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_exec_mode_basic.test ->
mysql-test/t/rpl_slave_exec_mode_basic.test
mysql-test/t/rpl_slave_net_timeout_basic.test@stripped, 2008-05-14 19:57:18-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_net_timeout_basic.test ->
mysql-test/t/rpl_slave_net_timeout_basic.test
mysql-test/t/rpl_slave_transaction_retries_basic_32.test@stripped, 2008-05-14 19:57:18-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_transaction_retries_basic_32.test ->
mysql-test/t/rpl_slave_transaction_retries_basic_32.test
mysql-test/t/rpl_slave_transaction_retries_basic_64.test@stripped, 2008-05-14 19:57:18-03:00,
davi@stripped +0 -0
Rename: mysql-test/t/slave_transaction_retries_basic_64.test ->
mysql-test/t/rpl_slave_transaction_retries_basic_64.test
mysql-test/t/slow_query_log_file_basic.test@stripped, 2008-05-14 20:24:09-03:00,
davi@stripped +3 -1
Right value is considered to be a text entity per default if it isn't
a number and doesn't have any spaces.
diff -Nrup a/mysql-test/r/rpl_slave-running.result b/mysql-test/r/rpl_slave-running.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave-running.result 2008-05-14 19:57:59 -03:00
@@ -0,0 +1,3 @@
+show status like 'Slave_running';
+Variable_name Value
+Slave_running ON
diff -Nrup a/mysql-test/r/rpl_slave-stopped.result b/mysql-test/r/rpl_slave-stopped.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave-stopped.result 2008-05-14 19:57:59 -03:00
@@ -0,0 +1,3 @@
+show status like 'Slave_running';
+Variable_name Value
+Slave_running OFF
diff -Nrup a/mysql-test/r/rpl_slave_allow_batching_basic.result
b/mysql-test/r/rpl_slave_allow_batching_basic.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_allow_batching_basic.result 2008-05-14 19:57:59 -03:00
@@ -0,0 +1,98 @@
+SET @global_start_value = @@global.slave_allow_batching;
+'Bug: This variable is not supported in mysql version 5.1.22'
+'#--------------------FN_DYNVARS_145_01------------------------#'
+SET @@global.slave_allow_batching = 1;
+SET @@global.slave_allow_batching = DEFAULT;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+0
+'#---------------------FN_DYNVARS_145_02-------------------------#'
+SET slave_allow_batching = 1;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
+SELECT @@slave_allow_batching;
+@@slave_allow_batching
+0
+SELECT global.slave_allow_batching;
+ERROR 42S02: Unknown table 'global' in field list
+SET global slave_allow_batching = 1;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+1
+'#--------------------FN_DYNVARS_145_03------------------------#'
+SET @@global.slave_allow_batching = 0;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+0
+SET @@global.slave_allow_batching = 1;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+1
+'#--------------------FN_DYNVARS_145_04-------------------------#'
+SET @@global.slave_allow_batching = -1;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '-1'
+SET @@global.slave_allow_batching = 2;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '2'
+SET @@global.slave_allow_batching = "T";
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'T'
+SET @@global.slave_allow_batching = "Y";
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'Y'
+SET @@global.slave_allow_batching = YES;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'YES'
+SET @@global.slave_allow_batching = ONN;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'ONN'
+SET @@global.slave_allow_batching = OOF;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'OOF'
+SET @@global.slave_allow_batching = 0FF;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '0FF'
+SET @@global.slave_allow_batching = ' 1';
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of ' 1'
+SET @@global.slave_allow_batching = NO;
+ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'NO'
+'#-------------------FN_DYNVARS_145_05----------------------------#'
+SET @@session.slave_allow_batching = 0;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
+SET @@slave_allow_batching = 0;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
+SET @@local.slave_allow_batching = 0;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
+SELECT @@session.slave_allow_batching;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable
+SELECT @@local.slave_allow_batching;
+ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable
+'#----------------------FN_DYNVARS_145_06------------------------#'
+SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
+count(VARIABLE_VALUE)
+1
+'#----------------------FN_DYNVARS_145_07------------------------#'
+SELECT @@global.slave_allow_batching = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
+@@global.slave_allow_batching = VARIABLE_VALUE
+0
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+1
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
+VARIABLE_VALUE
+ON
+'Bug: value in information schema does not match'
+'#---------------------FN_DYNVARS_145_08-------------------------#'
+SET @@global.slave_allow_batching = OFF;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+0
+SET @@global.slave_allow_batching = ON;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+1
+'#---------------------FN_DYNVARS_145_09----------------------#'
+SET @@global.slave_allow_batching = TRUE;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+1
+SET @@global.slave_allow_batching = FALSE;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+0
+SET @@global.slave_allow_batching = @global_start_value;
+SELECT @@global.slave_allow_batching;
+@@global.slave_allow_batching
+0
diff -Nrup a/mysql-test/r/rpl_slave_compressed_protocol_basic.result
b/mysql-test/r/rpl_slave_compressed_protocol_basic.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_compressed_protocol_basic.result 2008-05-14 19:57:59 -03:00
@@ -0,0 +1,103 @@
+SET @global_start_value = @@global.slave_compressed_protocol;
+SELECT @global_start_value;
+@global_start_value
+0
+'#--------------------FN_DYNVARS_147_01------------------------#'
+SET @@global.slave_compressed_protocol = 1;
+SET @@global.slave_compressed_protocol = DEFAULT;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+0
+'#---------------------FN_DYNVARS_147_02-------------------------#'
+SET slave_compressed_protocol = 1;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
+SELECT @@slave_compressed_protocol;
+@@slave_compressed_protocol
+0
+SELECT global.slave_compressed_protocol;
+ERROR 42S02: Unknown table 'global' in field list
+SET global slave_compressed_protocol = 1;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+1
+'#--------------------FN_DYNVARS_147_03------------------------#'
+SET @@global.slave_compressed_protocol = 0;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+0
+SET @@global.slave_compressed_protocol = 1;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+1
+'#--------------------FN_DYNVARS_147_04-------------------------#'
+SET @@global.slave_compressed_protocol = -1;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '-1'
+SET @@global.slave_compressed_protocol = 2;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '2'
+SET @@global.slave_compressed_protocol = "1.00";
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '1.00'
+SET @@global.slave_compressed_protocol = "Y";
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'Y'
+SET @@global.slave_compressed_protocol = YES;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'YES'
+SET @@global.slave_compressed_protocol = ONN;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'ONN'
+SET @@global.slave_compressed_protocol = 0FF;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '0FF'
+SET @@global.slave_compressed_protocol = ' 1';
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of ' 1'
+SET @@global.slave_compressed_protocol = NO;
+ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'NO'
+'#-------------------FN_DYNVARS_147_05----------------------------#'
+SET @@session.slave_compressed_protocol = 0;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@slave_compressed_protocol = 0;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@local.slave_compressed_protocol = 0;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
+SELECT @@session.slave_compressed_protocol;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable
+SELECT @@local.slave_compressed_protocol;
+ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable
+'#----------------------FN_DYNVARS_147_06------------------------#'
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+count(VARIABLE_VALUE)
+1
+'#----------------------FN_DYNVARS_147_07------------------------#'
+SELECT @@global.slave_compressed_protocol = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+@@global.slave_compressed_protocol = VARIABLE_VALUE
+0
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+1
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+VARIABLE_VALUE
+ON
+'#---------------------FN_DYNVARS_147_08-------------------------#'
+SET @@global.slave_compressed_protocol = OFF;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+0
+SET @@global.slave_compressed_protocol = ON;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+1
+'#---------------------FN_DYNVARS_147_09----------------------#'
+SET @@global.slave_compressed_protocol = TRUE;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+1
+SET @@global.slave_compressed_protocol = FALSE;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+0
+SET @@global.slave_compressed_protocol = @global_start_value;
+SELECT @@global.slave_compressed_protocol;
+@@global.slave_compressed_protocol
+0
diff -Nrup a/mysql-test/r/rpl_slave_exec_mode_basic.result
b/mysql-test/r/rpl_slave_exec_mode_basic.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_exec_mode_basic.result 2008-05-14 19:58:00 -03:00
@@ -0,0 +1,2 @@
+SET @start_value = @@global.slave_exec_mode;
+'This variable is not supported in version 5.1.22. It is introduced in 5.1.24'
diff -Nrup a/mysql-test/r/rpl_slave_net_timeout_basic.result
b/mysql-test/r/rpl_slave_net_timeout_basic.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_net_timeout_basic.result 2008-05-14 19:58:00 -03:00
@@ -0,0 +1,127 @@
+SET @start_global_value = @@global.slave_net_timeout;
+SELECT @start_global_value;
+@start_global_value
+3600
+'#--------------------FN_DYNVARS_146_01-------------------------#'
+SET @@global.slave_net_timeout = 500000;
+SET @@global.slave_net_timeout = DEFAULT;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+3600
+'#--------------------FN_DYNVARS_146_02-------------------------#'
+SET @@global.slave_net_timeout = DEFAULT;
+SELECT @@global.slave_net_timeout = 3600;
+@@global.slave_net_timeout = 3600
+1
+'#--------------------FN_DYNVARS_146_03-------------------------#'
+SET @@global.slave_net_timeout = 0;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '0'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+SET @@global.slave_net_timeout = 1;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+SET @@global.slave_net_timeout = 15;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+15
+SET @@global.slave_net_timeout = 1024;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1024
+SET @@global.slave_net_timeout = 3600+1;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+3601
+SET @@global.slave_net_timeout = 2147483648;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '2147483648'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+31536000
+SET @@global.slave_net_timeout = 2147483648*2-1;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '4294967295'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+31536000
+'#--------------------FN_DYNVARS_146_04-------------------------#'
+SET @@slave_net_timeout = 2;
+ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
+SET @@session.slave_net_timeout = 3;
+ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
+SET @@local.slave_net_timeout = 4;
+ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
+'#------------------FN_DYNVARS_146_05-----------------------#'
+SET @@global.slave_net_timeout = -1;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '0'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+SET @@global.slave_net_timeout = -2147483648;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '0'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+SET @@global.slave_net_timeout = 2147483649*2;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '4294967298'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+31536000
+SET @@global.slave_net_timeout = 65530.34.;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
+SET @@global.slave_net_timeout = 100s;
+ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
+SET @@global.slave_net_timeout = 7483649.56;
+ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
+SET @@global.slave_net_timeout = 0.6;
+ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
+'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
+'#------------------FN_DYNVARS_146_06-----------------------#'
+SET @@global.slave_net_timeout = 3000;
+SELECT @@global.slave_net_timeout = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_net_timeout';
+@@global.slave_net_timeout = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_146_07-----------------------#'
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_net_timeout';
+count(VARIABLE_VALUE)
+1
+'#------------------FN_DYNVARS_146_08-----------------------#'
+SET @@global.slave_net_timeout = TRUE;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+SET @@global.slave_net_timeout = FALSE;
+Warnings:
+Warning 1292 Truncated incorrect slave_net_timeout value: '0'
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+1
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@global.slave_net_timeout = 60*60;
+SELECT @@slave_net_timeout = @@global.slave_net_timeout;
+@@slave_net_timeout = @@global.slave_net_timeout
+1
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET slave_net_timeout = 2048;
+ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
+SELECT slave_net_timeout;
+ERROR 42S22: Unknown column 'slave_net_timeout' in 'field list'
+SELECT @@slave_net_timeout;
+@@slave_net_timeout
+3600
+SET global slave_net_timeout = 99;
+SET @@global.slave_net_timeout = @start_global_value;
+SELECT @@global.slave_net_timeout;
+@@global.slave_net_timeout
+3600
diff -Nrup a/mysql-test/r/rpl_slave_transaction_retries_basic_32.result
b/mysql-test/r/rpl_slave_transaction_retries_basic_32.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_transaction_retries_basic_32.result 2008-05-14 19:58:00
-03:00
@@ -0,0 +1,119 @@
+SET @start_global_value = @@global.slave_transaction_retries;
+SELECT @start_global_value;
+@start_global_value
+10
+'#--------------------FN_DYNVARS_149_01-------------------------#'
+SET @@global.slave_transaction_retries = 50;
+SET @@global.slave_transaction_retries = DEFAULT;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+10
+'#--------------------FN_DYNVARS_149_02-------------------------#'
+SET @@global.slave_transaction_retries = DEFAULT;
+SELECT @@global.slave_transaction_retries = 10;
+@@global.slave_transaction_retries = 10
+1
+'#--------------------FN_DYNVARS_149_03-------------------------#'
+SET @@global.slave_transaction_retries = 0;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+SET @@global.slave_transaction_retries = 1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1
+SET @@global.slave_transaction_retries = 15;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+15
+SET @@global.slave_transaction_retries = 1024;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1024
+SET @@global.slave_transaction_retries = 2147483648;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+2147483648
+SET @@global.slave_transaction_retries = 2147483648*2-1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+SET @@global.slave_transaction_retries = 2147483649*2;
+Warnings:
+Warning 1292 Truncated incorrect slave_transaction_retries value: '4294967298'
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+SET @@global.slave_transaction_retries = 4294967295;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+'#--------------------FN_DYNVARS_149_04-------------------------#'
+SET @@slave_transaction_retries = 2;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@session.slave_transaction_retries = 3;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@local.slave_transaction_retries = 4;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+'#------------------FN_DYNVARS_149_05-----------------------#'
+SET @@global.slave_transaction_retries = -1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+SET @@global.slave_transaction_retries = 2147483649*2147483649;
+Warnings:
+Warning 1292 Truncated incorrect slave_transaction_retries value: '4611686022722355201'
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
+SET @@global.slave_transaction_retries = 65530.34.;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
+SET @@global.slave_transaction_retries = '100';
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = 7483649.56;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = ON;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = OFF;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+'#------------------FN_DYNVARS_149_06-----------------------#'
+SET @@global.slave_transaction_retries = 3000;
+SELECT @@global.slave_transaction_retries = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_transaction_retries';
+@@global.slave_transaction_retries = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_149_07-----------------------#'
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_transaction_retries';
+count(VARIABLE_VALUE)
+1
+'#------------------FN_DYNVARS_149_08-----------------------#'
+SET @@global.slave_transaction_retries = TRUE;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1
+SET @@global.slave_transaction_retries = FALSE;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+'#---------------------FN_DYNVARS_149_09----------------------#'
+SET @@global.slave_transaction_retries = 60*60;
+SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
+@@slave_transaction_retries = @@global.slave_transaction_retries
+1
+'#---------------------FN_DYNVARS_149_10----------------------#'
+SET slave_transaction_retries = 2048;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SELECT slave_transaction_retries;
+ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
+SELECT @@slave_transaction_retries;
+@@slave_transaction_retries
+3600
+SET global slave_transaction_retries = 99;
+SET @@global.slave_transaction_retries = @start_global_value;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+10
diff -Nrup a/mysql-test/r/rpl_slave_transaction_retries_basic_64.result
b/mysql-test/r/rpl_slave_transaction_retries_basic_64.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/rpl_slave_transaction_retries_basic_64.result 2008-05-14 19:58:00
-03:00
@@ -0,0 +1,115 @@
+SET @start_global_value = @@global.slave_transaction_retries;
+SELECT @start_global_value;
+@start_global_value
+10
+'#--------------------FN_DYNVARS_149_01-------------------------#'
+SET @@global.slave_transaction_retries = 50;
+SET @@global.slave_transaction_retries = DEFAULT;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+10
+'#--------------------FN_DYNVARS_149_02-------------------------#'
+SET @@global.slave_transaction_retries = DEFAULT;
+SELECT @@global.slave_transaction_retries = 10;
+@@global.slave_transaction_retries = 10
+1
+'#--------------------FN_DYNVARS_149_03-------------------------#'
+SET @@global.slave_transaction_retries = 0;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+SET @@global.slave_transaction_retries = 1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1
+SET @@global.slave_transaction_retries = 15;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+15
+SET @@global.slave_transaction_retries = 1024;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1024
+SET @@global.slave_transaction_retries = 2147483648;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+2147483648
+SET @@global.slave_transaction_retries = 2147483648*2-1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+SET @@global.slave_transaction_retries = 2147483649*2;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967298
+SET @@global.slave_transaction_retries = 4294967295;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4294967295
+'#--------------------FN_DYNVARS_149_04-------------------------#'
+SET @@slave_transaction_retries = 2;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@session.slave_transaction_retries = 3;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SET @@local.slave_transaction_retries = 4;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+'#------------------FN_DYNVARS_149_05-----------------------#'
+SET @@global.slave_transaction_retries = -1;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+SET @@global.slave_transaction_retries = 2147483649*2147483649;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+4611686022722355201
+'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
+SET @@global.slave_transaction_retries = 65530.34.;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
+SET @@global.slave_transaction_retries = '100';
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = 7483649.56;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = ON;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+SET @@global.slave_transaction_retries = OFF;
+ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
+'#------------------FN_DYNVARS_149_06-----------------------#'
+SET @@global.slave_transaction_retries = 3000;
+SELECT @@global.slave_transaction_retries = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_transaction_retries';
+@@global.slave_transaction_retries = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_149_07-----------------------#'
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_transaction_retries';
+count(VARIABLE_VALUE)
+1
+'#------------------FN_DYNVARS_149_08-----------------------#'
+SET @@global.slave_transaction_retries = TRUE;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+1
+SET @@global.slave_transaction_retries = FALSE;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+0
+'#---------------------FN_DYNVARS_149_09----------------------#'
+SET @@global.slave_transaction_retries = 60*60;
+SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
+@@slave_transaction_retries = @@global.slave_transaction_retries
+1
+'#---------------------FN_DYNVARS_149_10----------------------#'
+SET slave_transaction_retries = 2048;
+ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
+SELECT slave_transaction_retries;
+ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
+SELECT @@slave_transaction_retries;
+@@slave_transaction_retries
+3600
+SET global slave_transaction_retries = 99;
+SET @@global.slave_transaction_retries = @start_global_value;
+SELECT @@global.slave_transaction_retries;
+@@global.slave_transaction_retries
+10
diff -Nrup a/mysql-test/r/slave-running.result b/mysql-test/r/slave-running.result
--- a/mysql-test/r/slave-running.result 2001-10-10 21:59:45 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
-show status like 'Slave_running';
-Variable_name Value
-Slave_running ON
diff -Nrup a/mysql-test/r/slave-stopped.result b/mysql-test/r/slave-stopped.result
--- a/mysql-test/r/slave-stopped.result 2001-10-10 21:59:45 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
-show status like 'Slave_running';
-Variable_name Value
-Slave_running OFF
diff -Nrup a/mysql-test/r/slave_allow_batching_basic.result
b/mysql-test/r/slave_allow_batching_basic.result
--- a/mysql-test/r/slave_allow_batching_basic.result 2008-04-10 13:22:34 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,98 +0,0 @@
-SET @global_start_value = @@global.slave_allow_batching;
-'Bug: This variable is not supported in mysql version 5.1.22'
-'#--------------------FN_DYNVARS_145_01------------------------#'
-SET @@global.slave_allow_batching = 1;
-SET @@global.slave_allow_batching = DEFAULT;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-0
-'#---------------------FN_DYNVARS_145_02-------------------------#'
-SET slave_allow_batching = 1;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
-SELECT @@slave_allow_batching;
-@@slave_allow_batching
-0
-SELECT global.slave_allow_batching;
-ERROR 42S02: Unknown table 'global' in field list
-SET global slave_allow_batching = 1;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-1
-'#--------------------FN_DYNVARS_145_03------------------------#'
-SET @@global.slave_allow_batching = 0;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-0
-SET @@global.slave_allow_batching = 1;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-1
-'#--------------------FN_DYNVARS_145_04-------------------------#'
-SET @@global.slave_allow_batching = -1;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '-1'
-SET @@global.slave_allow_batching = 2;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '2'
-SET @@global.slave_allow_batching = "T";
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'T'
-SET @@global.slave_allow_batching = "Y";
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'Y'
-SET @@global.slave_allow_batching = YES;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'YES'
-SET @@global.slave_allow_batching = ONN;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'ONN'
-SET @@global.slave_allow_batching = OOF;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'OOF'
-SET @@global.slave_allow_batching = 0FF;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of '0FF'
-SET @@global.slave_allow_batching = ' 1';
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of ' 1'
-SET @@global.slave_allow_batching = NO;
-ERROR 42000: Variable 'slave_allow_batching' can't be set to the value of 'NO'
-'#-------------------FN_DYNVARS_145_05----------------------------#'
-SET @@session.slave_allow_batching = 0;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
-SET @@slave_allow_batching = 0;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
-SET @@local.slave_allow_batching = 0;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable and should be set with
SET GLOBAL
-SELECT @@session.slave_allow_batching;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable
-SELECT @@local.slave_allow_batching;
-ERROR HY000: Variable 'slave_allow_batching' is a GLOBAL variable
-'#----------------------FN_DYNVARS_145_06------------------------#'
-SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
-count(VARIABLE_VALUE)
-1
-'#----------------------FN_DYNVARS_145_07------------------------#'
-SELECT @@global.slave_allow_batching = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
-@@global.slave_allow_batching = VARIABLE_VALUE
-0
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-1
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
-VARIABLE_VALUE
-ON
-'Bug: value in information schema does not match'
-'#---------------------FN_DYNVARS_145_08-------------------------#'
-SET @@global.slave_allow_batching = OFF;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-0
-SET @@global.slave_allow_batching = ON;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-1
-'#---------------------FN_DYNVARS_145_09----------------------#'
-SET @@global.slave_allow_batching = TRUE;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-1
-SET @@global.slave_allow_batching = FALSE;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-0
-SET @@global.slave_allow_batching = @global_start_value;
-SELECT @@global.slave_allow_batching;
-@@global.slave_allow_batching
-0
diff -Nrup a/mysql-test/r/slave_compressed_protocol_basic.result
b/mysql-test/r/slave_compressed_protocol_basic.result
--- a/mysql-test/r/slave_compressed_protocol_basic.result 2008-04-10 10:13:40 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,103 +0,0 @@
-SET @global_start_value = @@global.slave_compressed_protocol;
-SELECT @global_start_value;
-@global_start_value
-0
-'#--------------------FN_DYNVARS_147_01------------------------#'
-SET @@global.slave_compressed_protocol = 1;
-SET @@global.slave_compressed_protocol = DEFAULT;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-0
-'#---------------------FN_DYNVARS_147_02-------------------------#'
-SET slave_compressed_protocol = 1;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
-SELECT @@slave_compressed_protocol;
-@@slave_compressed_protocol
-0
-SELECT global.slave_compressed_protocol;
-ERROR 42S02: Unknown table 'global' in field list
-SET global slave_compressed_protocol = 1;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-1
-'#--------------------FN_DYNVARS_147_03------------------------#'
-SET @@global.slave_compressed_protocol = 0;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-0
-SET @@global.slave_compressed_protocol = 1;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-1
-'#--------------------FN_DYNVARS_147_04-------------------------#'
-SET @@global.slave_compressed_protocol = -1;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '-1'
-SET @@global.slave_compressed_protocol = 2;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '2'
-SET @@global.slave_compressed_protocol = "1.00";
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '1.00'
-SET @@global.slave_compressed_protocol = "Y";
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'Y'
-SET @@global.slave_compressed_protocol = YES;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'YES'
-SET @@global.slave_compressed_protocol = ONN;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'ONN'
-SET @@global.slave_compressed_protocol = 0FF;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of '0FF'
-SET @@global.slave_compressed_protocol = ' 1';
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of ' 1'
-SET @@global.slave_compressed_protocol = NO;
-ERROR 42000: Variable 'slave_compressed_protocol' can't be set to the value of 'NO'
-'#-------------------FN_DYNVARS_147_05----------------------------#'
-SET @@session.slave_compressed_protocol = 0;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@slave_compressed_protocol = 0;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@local.slave_compressed_protocol = 0;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable and should be set
with SET GLOBAL
-SELECT @@session.slave_compressed_protocol;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable
-SELECT @@local.slave_compressed_protocol;
-ERROR HY000: Variable 'slave_compressed_protocol' is a GLOBAL variable
-'#----------------------FN_DYNVARS_147_06------------------------#'
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-count(VARIABLE_VALUE)
-1
-'#----------------------FN_DYNVARS_147_07------------------------#'
-SELECT @@global.slave_compressed_protocol = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-@@global.slave_compressed_protocol = VARIABLE_VALUE
-0
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-1
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-VARIABLE_VALUE
-ON
-'#---------------------FN_DYNVARS_147_08-------------------------#'
-SET @@global.slave_compressed_protocol = OFF;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-0
-SET @@global.slave_compressed_protocol = ON;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-1
-'#---------------------FN_DYNVARS_147_09----------------------#'
-SET @@global.slave_compressed_protocol = TRUE;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-1
-SET @@global.slave_compressed_protocol = FALSE;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-0
-SET @@global.slave_compressed_protocol = @global_start_value;
-SELECT @@global.slave_compressed_protocol;
-@@global.slave_compressed_protocol
-0
diff -Nrup a/mysql-test/r/slave_exec_mode_basic.result
b/mysql-test/r/slave_exec_mode_basic.result
--- a/mysql-test/r/slave_exec_mode_basic.result 2008-04-10 10:13:40 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,2 +0,0 @@
-SET @start_value = @@global.slave_exec_mode;
-'This variable is not supported in version 5.1.22. It is introduced in 5.1.24'
diff -Nrup a/mysql-test/r/slave_net_timeout_basic.result
b/mysql-test/r/slave_net_timeout_basic.result
--- a/mysql-test/r/slave_net_timeout_basic.result 2008-04-10 10:13:40 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,127 +0,0 @@
-SET @start_global_value = @@global.slave_net_timeout;
-SELECT @start_global_value;
-@start_global_value
-3600
-'#--------------------FN_DYNVARS_146_01-------------------------#'
-SET @@global.slave_net_timeout = 500000;
-SET @@global.slave_net_timeout = DEFAULT;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-3600
-'#--------------------FN_DYNVARS_146_02-------------------------#'
-SET @@global.slave_net_timeout = DEFAULT;
-SELECT @@global.slave_net_timeout = 3600;
-@@global.slave_net_timeout = 3600
-1
-'#--------------------FN_DYNVARS_146_03-------------------------#'
-SET @@global.slave_net_timeout = 0;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '0'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-SET @@global.slave_net_timeout = 1;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-SET @@global.slave_net_timeout = 15;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-15
-SET @@global.slave_net_timeout = 1024;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1024
-SET @@global.slave_net_timeout = 3600+1;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-3601
-SET @@global.slave_net_timeout = 2147483648;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '2147483648'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-31536000
-SET @@global.slave_net_timeout = 2147483648*2-1;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '4294967295'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-31536000
-'#--------------------FN_DYNVARS_146_04-------------------------#'
-SET @@slave_net_timeout = 2;
-ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
-SET @@session.slave_net_timeout = 3;
-ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
-SET @@local.slave_net_timeout = 4;
-ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
-'#------------------FN_DYNVARS_146_05-----------------------#'
-SET @@global.slave_net_timeout = -1;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '0'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-SET @@global.slave_net_timeout = -2147483648;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '0'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-SET @@global.slave_net_timeout = 2147483649*2;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '4294967298'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-31536000
-SET @@global.slave_net_timeout = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
-SET @@global.slave_net_timeout = 100s;
-ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
-SET @@global.slave_net_timeout = 7483649.56;
-ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
-SET @@global.slave_net_timeout = 0.6;
-ERROR 42000: Incorrect argument type to variable 'slave_net_timeout'
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
-'#------------------FN_DYNVARS_146_06-----------------------#'
-SET @@global.slave_net_timeout = 3000;
-SELECT @@global.slave_net_timeout = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_net_timeout';
-@@global.slave_net_timeout = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_146_07-----------------------#'
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_net_timeout';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_146_08-----------------------#'
-SET @@global.slave_net_timeout = TRUE;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-SET @@global.slave_net_timeout = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect slave_net_timeout value: '0'
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.slave_net_timeout = 60*60;
-SELECT @@slave_net_timeout = @@global.slave_net_timeout;
-@@slave_net_timeout = @@global.slave_net_timeout
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET slave_net_timeout = 2048;
-ERROR HY000: Variable 'slave_net_timeout' is a GLOBAL variable and should be set with SET
GLOBAL
-SELECT slave_net_timeout;
-ERROR 42S22: Unknown column 'slave_net_timeout' in 'field list'
-SELECT @@slave_net_timeout;
-@@slave_net_timeout
-3600
-SET global slave_net_timeout = 99;
-SET @@global.slave_net_timeout = @start_global_value;
-SELECT @@global.slave_net_timeout;
-@@global.slave_net_timeout
-3600
diff -Nrup a/mysql-test/r/slave_transaction_retries_basic_32.result
b/mysql-test/r/slave_transaction_retries_basic_32.result
--- a/mysql-test/r/slave_transaction_retries_basic_32.result 2008-05-08 15:13:20 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,119 +0,0 @@
-SET @start_global_value = @@global.slave_transaction_retries;
-SELECT @start_global_value;
-@start_global_value
-10
-'#--------------------FN_DYNVARS_149_01-------------------------#'
-SET @@global.slave_transaction_retries = 50;
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
-'#--------------------FN_DYNVARS_149_02-------------------------#'
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries = 10;
-@@global.slave_transaction_retries = 10
-1
-'#--------------------FN_DYNVARS_149_03-------------------------#'
-SET @@global.slave_transaction_retries = 0;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = 15;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-15
-SET @@global.slave_transaction_retries = 1024;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1024
-SET @@global.slave_transaction_retries = 2147483648;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-2147483648
-SET @@global.slave_transaction_retries = 2147483648*2-1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 2147483649*2;
-Warnings:
-Warning 1292 Truncated incorrect slave_transaction_retries value: '4294967298'
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 4294967295;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-'#--------------------FN_DYNVARS_149_04-------------------------#'
-SET @@slave_transaction_retries = 2;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@session.slave_transaction_retries = 3;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@local.slave_transaction_retries = 4;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-'#------------------FN_DYNVARS_149_05-----------------------#'
-SET @@global.slave_transaction_retries = -1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 2147483649*2147483649;
-Warnings:
-Warning 1292 Truncated incorrect slave_transaction_retries value: '4611686022722355201'
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
-SET @@global.slave_transaction_retries = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
-SET @@global.slave_transaction_retries = '100';
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = 7483649.56;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = ON;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = OFF;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-'#------------------FN_DYNVARS_149_06-----------------------#'
-SET @@global.slave_transaction_retries = 3000;
-SELECT @@global.slave_transaction_retries = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_transaction_retries';
-@@global.slave_transaction_retries = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_149_07-----------------------#'
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_transaction_retries';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_149_08-----------------------#'
-SET @@global.slave_transaction_retries = TRUE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = FALSE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-'#---------------------FN_DYNVARS_149_09----------------------#'
-SET @@global.slave_transaction_retries = 60*60;
-SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
-@@slave_transaction_retries = @@global.slave_transaction_retries
-1
-'#---------------------FN_DYNVARS_149_10----------------------#'
-SET slave_transaction_retries = 2048;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SELECT slave_transaction_retries;
-ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
-SELECT @@slave_transaction_retries;
-@@slave_transaction_retries
-3600
-SET global slave_transaction_retries = 99;
-SET @@global.slave_transaction_retries = @start_global_value;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
diff -Nrup a/mysql-test/r/slave_transaction_retries_basic_64.result
b/mysql-test/r/slave_transaction_retries_basic_64.result
--- a/mysql-test/r/slave_transaction_retries_basic_64.result 2008-05-08 15:13:20 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,115 +0,0 @@
-SET @start_global_value = @@global.slave_transaction_retries;
-SELECT @start_global_value;
-@start_global_value
-10
-'#--------------------FN_DYNVARS_149_01-------------------------#'
-SET @@global.slave_transaction_retries = 50;
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
-'#--------------------FN_DYNVARS_149_02-------------------------#'
-SET @@global.slave_transaction_retries = DEFAULT;
-SELECT @@global.slave_transaction_retries = 10;
-@@global.slave_transaction_retries = 10
-1
-'#--------------------FN_DYNVARS_149_03-------------------------#'
-SET @@global.slave_transaction_retries = 0;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = 15;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-15
-SET @@global.slave_transaction_retries = 1024;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1024
-SET @@global.slave_transaction_retries = 2147483648;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-2147483648
-SET @@global.slave_transaction_retries = 2147483648*2-1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-SET @@global.slave_transaction_retries = 2147483649*2;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967298
-SET @@global.slave_transaction_retries = 4294967295;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4294967295
-'#--------------------FN_DYNVARS_149_04-------------------------#'
-SET @@slave_transaction_retries = 2;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@session.slave_transaction_retries = 3;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SET @@local.slave_transaction_retries = 4;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-'#------------------FN_DYNVARS_149_05-----------------------#'
-SET @@global.slave_transaction_retries = -1;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-SET @@global.slave_transaction_retries = 2147483649*2147483649;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-4611686022722355201
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
-SET @@global.slave_transaction_retries = 65530.34.;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
-SET @@global.slave_transaction_retries = '100';
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = 7483649.56;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = ON;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-SET @@global.slave_transaction_retries = OFF;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-'#------------------FN_DYNVARS_149_06-----------------------#'
-SET @@global.slave_transaction_retries = 3000;
-SELECT @@global.slave_transaction_retries = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_transaction_retries';
-@@global.slave_transaction_retries = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_149_07-----------------------#'
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_transaction_retries';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_149_08-----------------------#'
-SET @@global.slave_transaction_retries = TRUE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-1
-SET @@global.slave_transaction_retries = FALSE;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-0
-'#---------------------FN_DYNVARS_149_09----------------------#'
-SET @@global.slave_transaction_retries = 60*60;
-SELECT @@slave_transaction_retries = @@global.slave_transaction_retries;
-@@slave_transaction_retries = @@global.slave_transaction_retries
-1
-'#---------------------FN_DYNVARS_149_10----------------------#'
-SET slave_transaction_retries = 2048;
-ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set
with SET GLOBAL
-SELECT slave_transaction_retries;
-ERROR 42S22: Unknown column 'slave_transaction_retries' in 'field list'
-SELECT @@slave_transaction_retries;
-@@slave_transaction_retries
-3600
-SET global slave_transaction_retries = 99;
-SET @@global.slave_transaction_retries = @start_global_value;
-SELECT @@global.slave_transaction_retries;
-@@global.slave_transaction_retries
-10
diff -Nrup a/mysql-test/r/slow_query_log_file_basic.result
b/mysql-test/r/slow_query_log_file_basic.result
--- a/mysql-test/r/slow_query_log_file_basic.result 2008-04-10 10:13:41 -03:00
+++ b/mysql-test/r/slow_query_log_file_basic.result 2008-05-14 20:24:08 -03:00
@@ -9,7 +9,8 @@ RIGHT(@@global.slow_query_log_file,15)
master-slow.log
'#--------------------FN_DYNVARS_004_02------------------------#'
SET @@global.slow_query_log_file = mytest.log;
-ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'log'
+SET @@global.slow_query_log_file = 12;
+ERROR 42000: Incorrect argument type to variable 'slow_query_log_file'
'#----------------------FN_DYNVARS_004_03------------------------#'
SELECT @@global.slow_query_log_file = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
diff -Nrup a/mysql-test/r/variables.result b/mysql-test/r/variables.result
--- a/mysql-test/r/variables.result 2008-03-31 07:53:21 -03:00
+++ b/mysql-test/r/variables.result 2008-05-14 20:24:08 -03:00
@@ -1020,5 +1020,7 @@ SET GLOBAL log_output = '';
ERROR 42000: Variable 'log_output' can't be set to the value of ''
SET GLOBAL log_output = 0;
ERROR 42000: Variable 'log_output' can't be set to the value of '0'
+SET GLOBAL log_output = NULL;
+ERROR 42000: Variable 'log_output' can't be set to the value of 'NULL'
# -- End of Bug#34820.
diff -Nrup a/mysql-test/suite/binlog/r/binlog_innodb.result
b/mysql-test/suite/binlog/r/binlog_innodb.result
--- a/mysql-test/suite/binlog/r/binlog_innodb.result 2008-02-25 13:05:59 -03:00
+++ b/mysql-test/suite/binlog/r/binlog_innodb.result 2008-05-14 20:24:08 -03:00
@@ -110,7 +110,6 @@ master-bin.000001 # Table_map # # table_
master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: #
-master-bin.000001 # Update_rows # # table_id: #
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */
master-bin.000001 # Query # # use `test`; BEGIN
@@ -132,16 +131,17 @@ master-bin.000001 # Update_rows # # tabl
master-bin.000001 # Update_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */
DROP TABLE t1;
+flush status;
show status like "binlog_cache_use";
Variable_name Value
-Binlog_cache_use 13
+Binlog_cache_use 0
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
-Binlog_cache_use 14
+Binlog_cache_use 1
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
@@ -150,7 +150,7 @@ delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
-Binlog_cache_use 15
+Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
diff -Nrup a/mysql-test/suite/binlog/t/binlog_innodb.test
b/mysql-test/suite/binlog/t/binlog_innodb.test
--- a/mysql-test/suite/binlog/t/binlog_innodb.test 2008-02-03 07:00:46 -02:00
+++ b/mysql-test/suite/binlog/t/binlog_innodb.test 2008-05-14 20:24:08 -03:00
@@ -101,6 +101,7 @@ DROP TABLE t1;
# Actually this test has nothing to do with innodb per se, it just requires
# transactional table.
#
+flush status;
show status like "binlog_cache_use";
show status like "binlog_cache_disk_use";
diff -Nrup a/mysql-test/t/rpl_slave_allow_batching_basic.test
b/mysql-test/t/rpl_slave_allow_batching_basic.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_allow_batching_basic.test 2008-05-14 19:57:17 -03:00
@@ -0,0 +1,166 @@
+############## mysql-test\t\slave_allow_batching_basic.test ####################
+# #
+# Variable Name: slave_allow_batching #
+# Scope: GLOBAL & SESSION #
+# Access Type: Dynamic #
+# Data Type: Numeric #
+# Default Value: 1 #
+# Range: 1 - 65536 #
+# #
+# #
+# Creation Date: 2008-02-07 #
+# Author: Rizwan Maredia #
+# #
+# Description: Test Cases of Dynamic System Variable slave_allow_batching #
+# that checks the behavior of this variable in the following ways #
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
+# server-system-variables.html #
+# #
+################################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+# START OF slave_allow_batching TESTS #
+########################################################################
+
+
+################################################################################
+# Saving initial value of slave_allow_batching in a temporary variable #
+################################################################################
+
+SET @global_start_value = @@global.slave_allow_batching;
+
+--echo 'Bug: This variable is not supported in mysql version 5.1.22'
+
+--echo '#--------------------FN_DYNVARS_145_01------------------------#'
+########################################################################
+# Display the DEFAULT value of slave_allow_batching #
+########################################################################
+
+SET @@global.slave_allow_batching = 1;
+SET @@global.slave_allow_batching = DEFAULT;
+SELECT @@global.slave_allow_batching;
+
+--echo '#---------------------FN_DYNVARS_145_02-------------------------#'
+#############################################################################
+# Check if slave_allow_batching can be accessed with and without @@ sign #
+#############################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET slave_allow_batching = 1;
+SELECT @@slave_allow_batching;
+--Error ER_UNKNOWN_TABLE
+SELECT global.slave_allow_batching;
+
+SET global slave_allow_batching = 1;
+SELECT @@global.slave_allow_batching;
+
+
+--echo '#--------------------FN_DYNVARS_145_03------------------------#'
+########################################################################
+# Change the value of slave_allow_batching to a valid value #
+########################################################################
+
+SET @@global.slave_allow_batching = 0;
+SELECT @@global.slave_allow_batching;
+SET @@global.slave_allow_batching = 1;
+SELECT @@global.slave_allow_batching;
+
+
+--echo '#--------------------FN_DYNVARS_145_04-------------------------#'
+###########################################################################
+# Change the value of slave_allow_batching to invalid value #
+###########################################################################
+
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = -1;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = 2;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = "T";
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = "Y";
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = YES;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = ONN;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = OOF;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = 0FF;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = ' 1';
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_allow_batching = NO;
+
+
+--echo '#-------------------FN_DYNVARS_145_05----------------------------#'
+###########################################################################
+# Test if accessing session slave_allow_batching gives error #
+###########################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET @@session.slave_allow_batching = 0;
+--Error ER_GLOBAL_VARIABLE
+SET @@slave_allow_batching = 0;
+--Error ER_GLOBAL_VARIABLE
+SET @@local.slave_allow_batching = 0;
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@session.slave_allow_batching;
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@local.slave_allow_batching;
+
+--echo '#----------------------FN_DYNVARS_145_06------------------------#'
+#########################################################################
+# Check if the value in SESSION Table contains variable value #
+#########################################################################
+
+SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
+
+
+--echo '#----------------------FN_DYNVARS_145_07------------------------#'
+#########################################################################
+# Check if the value in GLOBAL Table matches value in variable #
+#########################################################################
+
+SELECT @@global.slave_allow_batching = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
+SELECT @@global.slave_allow_batching;
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
+--echo 'Bug: value in information schema does not match'
+
+--echo '#---------------------FN_DYNVARS_145_08-------------------------#'
+###################################################################
+# Check if ON and OFF values can be used on variable #
+###################################################################
+
+SET @@global.slave_allow_batching = OFF;
+SELECT @@global.slave_allow_batching;
+SET @@global.slave_allow_batching = ON;
+SELECT @@global.slave_allow_batching;
+
+--echo '#---------------------FN_DYNVARS_145_09----------------------#'
+###################################################################
+# Check if TRUE and FALSE values can be used on variable #
+###################################################################
+
+SET @@global.slave_allow_batching = TRUE;
+SELECT @@global.slave_allow_batching;
+SET @@global.slave_allow_batching = FALSE;
+SELECT @@global.slave_allow_batching;
+
+##############################
+# Restore initial value #
+##############################
+
+SET @@global.slave_allow_batching = @global_start_value;
+SELECT @@global.slave_allow_batching;
+
+###############################################################
+# END OF slave_allow_batching TESTS #
+###############################################################
diff -Nrup a/mysql-test/t/rpl_slave_compressed_protocol_basic.test
b/mysql-test/t/rpl_slave_compressed_protocol_basic.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_compressed_protocol_basic.test 2008-05-14 19:57:18 -03:00
@@ -0,0 +1,167 @@
+############# mysql-test\t\slave_compressed_protocol_basic.test ###############
+# #
+# Variable Name: slave_compressed_protocol #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: boolean #
+# Default Value: FALSE #
+# Range: TRUE, FALSE #
+# #
+# #
+# Creation Date: 2008-02-07 #
+# Author: Rizwan #
+# #
+# Description: Test Cases of Dynamic System Variable slave_compressed_protocol#
+# that checks the behavior of this variable in the following ways#
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
+# server-system-variables.html #
+# #
+###############################################################################
+
+--source include/not_embedded.inc
+--source include/load_sysvars.inc
+########################################################################
+# START OF slave_compressed_protocol TESTS #
+########################################################################
+
+
+##############################################################################
+# Saving initial value of slave_compressed_protocol in a temporary variable #
+##############################################################################
+
+SET @global_start_value = @@global.slave_compressed_protocol;
+SELECT @global_start_value;
+
+--echo '#--------------------FN_DYNVARS_147_01------------------------#'
+########################################################################
+# Display the DEFAULT value of slave_compressed_protocol #
+########################################################################
+
+SET @@global.slave_compressed_protocol = 1;
+SET @@global.slave_compressed_protocol = DEFAULT;
+SELECT @@global.slave_compressed_protocol;
+
+--echo '#---------------------FN_DYNVARS_147_02-------------------------#'
+###############################################################################
+# Check if slave_compressed_protocol can be accessed with and without @@ sign #
+###############################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET slave_compressed_protocol = 1;
+SELECT @@slave_compressed_protocol;
+--Error ER_UNKNOWN_TABLE
+SELECT global.slave_compressed_protocol;
+
+SET global slave_compressed_protocol = 1;
+SELECT @@global.slave_compressed_protocol;
+
+
+--echo '#--------------------FN_DYNVARS_147_03------------------------#'
+########################################################################
+# Change the value of slave_compressed_protocol to a valid value #
+########################################################################
+
+SET @@global.slave_compressed_protocol = 0;
+SELECT @@global.slave_compressed_protocol;
+SET @@global.slave_compressed_protocol = 1;
+SELECT @@global.slave_compressed_protocol;
+
+
+--echo '#--------------------FN_DYNVARS_147_04-------------------------#'
+###########################################################################
+# Change the value of slave_compressed_protocol to invalid value #
+###########################################################################
+
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = -1;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = 2;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = "1.00";
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = "Y";
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = YES;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = ONN;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = 0FF;
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = ' 1';
+--Error ER_WRONG_VALUE_FOR_VAR
+SET @@global.slave_compressed_protocol = NO;
+
+
+--echo '#-------------------FN_DYNVARS_147_05----------------------------#'
+###########################################################################
+# Test if accessing session slave_compressed_protocol gives error #
+###########################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET @@session.slave_compressed_protocol = 0;
+--Error ER_GLOBAL_VARIABLE
+SET @@slave_compressed_protocol = 0;
+--Error ER_GLOBAL_VARIABLE
+SET @@local.slave_compressed_protocol = 0;
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@session.slave_compressed_protocol;
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@local.slave_compressed_protocol;
+
+--echo '#----------------------FN_DYNVARS_147_06------------------------#'
+#########################################################################
+# Check if the value in SESSION Table contains variable value #
+#########################################################################
+
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+
+--echo '#----------------------FN_DYNVARS_147_07------------------------#'
+#########################################################################
+# Check if the value in GLOBAL Table matches value in variable #
+#########################################################################
+
+SELECT @@global.slave_compressed_protocol = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+SELECT @@global.slave_compressed_protocol;
+SELECT VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_compressed_protocol';
+
+--echo '#---------------------FN_DYNVARS_147_08-------------------------#'
+###################################################################
+# Check if ON and OFF values can be used on variable #
+###################################################################
+
+SET @@global.slave_compressed_protocol = OFF;
+SELECT @@global.slave_compressed_protocol;
+SET @@global.slave_compressed_protocol = ON;
+SELECT @@global.slave_compressed_protocol;
+
+--echo '#---------------------FN_DYNVARS_147_09----------------------#'
+###################################################################
+# Check if TRUE and FALSE values can be used on variable #
+###################################################################
+
+SET @@global.slave_compressed_protocol = TRUE;
+SELECT @@global.slave_compressed_protocol;
+SET @@global.slave_compressed_protocol = FALSE;
+SELECT @@global.slave_compressed_protocol;
+
+##############################
+# Restore initial value #
+##############################
+
+SET @@global.slave_compressed_protocol = @global_start_value;
+SELECT @@global.slave_compressed_protocol;
+
+###############################################################
+# END OF slave_compressed_protocol TESTS #
+###############################################################
diff -Nrup a/mysql-test/t/rpl_slave_exec_mode_basic.test
b/mysql-test/t/rpl_slave_exec_mode_basic.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_exec_mode_basic.test 2008-05-14 19:57:18 -03:00
@@ -0,0 +1,41 @@
+############## mysql-test\t\slave_exec_mode_basic.test #########################
+# #
+# Variable Name: slave_exec_mode #
+# Scope: GLOBAL & SESSION #
+# Access Type: Dynamic #
+# Data Type: Numeric #
+# Default Value: 1 #
+# Range: 1 - 65536 #
+# #
+# #
+# Creation Date: 2008-02-07 #
+# Author: Rizwan Maredia #
+# #
+# Description: Test Cases of Dynamic System Variable slave_exec_mode #
+# that checks the behavior of this variable in the following ways #
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
+# server-system-variables.html #
+# #
+################################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+# START OF slave_exec_mode TESTS #
+########################################################################
+
+
+########################################################################
+# Saving initial value of slave_exec_mode in a temporary variable #
+########################################################################
+SET @start_value = @@global.slave_exec_mode;
+--echo 'This variable is not supported in version 5.1.22. It is introduced in 5.1.24'
+
+########################################################################
+# END OF slave_exec_mode TESTS #
+########################################################################
diff -Nrup a/mysql-test/t/rpl_slave_net_timeout_basic.test
b/mysql-test/t/rpl_slave_net_timeout_basic.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_net_timeout_basic.test 2008-05-14 19:57:18 -03:00
@@ -0,0 +1,187 @@
+################## mysql-test\t\slave_net_timeout_basic.test ##################
+# #
+# Variable Name: slave_net_timeout #
+# Scope: GLOBAL #
+# Access Type: Dynamic #
+# Data Type: numeric #
+# Default Value: 3600 #
+# Range: #
+# #
+# #
+# Creation Date: 2008-02-07 #
+# Author: Rizwan #
+# #
+# Description: Test Cases of Dynamic System Variable slave_net_timeout #
+# that checks the behavior of this variable in the following ways#
+# * Default Value #
+# * Valid & Invalid values #
+# * Scope & Access method #
+# * Data Integrity #
+# #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
+# server-system-variables.html #
+# #
+###############################################################################
+
+--source include/not_embedded.inc
+--source include/load_sysvars.inc
+###########################################################
+# START OF slave_net_timeout TESTS #
+###########################################################
+
+
+#############################################################
+# Save initial value #
+#############################################################
+
+SET @start_global_value = @@global.slave_net_timeout;
+SELECT @start_global_value;
+
+--echo '#--------------------FN_DYNVARS_146_01-------------------------#'
+###########################################################
+# Display the DEFAULT value of slave_net_timeout #
+###########################################################
+
+SET @@global.slave_net_timeout = 500000;
+SET @@global.slave_net_timeout = DEFAULT;
+SELECT @@global.slave_net_timeout;
+
+--echo '#--------------------FN_DYNVARS_146_02-------------------------#'
+############################################################
+# Check the DEFAULT value of slave_net_timeout #
+############################################################
+
+SET @@global.slave_net_timeout = DEFAULT;
+SELECT @@global.slave_net_timeout = 3600;
+
+--echo '#--------------------FN_DYNVARS_146_03-------------------------#'
+###########################################################################
+# Change the value of slave_net_timeout to a valid value for GLOBAL Scope #
+###########################################################################
+
+SET @@global.slave_net_timeout = 0;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 1;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 15;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 1024;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 3600+1;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 2147483648;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = 2147483648*2-1;
+SELECT @@global.slave_net_timeout;
+
+
+--echo '#--------------------FN_DYNVARS_146_04-------------------------#'
+###############################################################################
+# Check if variable can be access with session scope #
+###############################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET @@slave_net_timeout = 2;
+
+--Error ER_GLOBAL_VARIABLE
+SET @@session.slave_net_timeout = 3;
+
+--Error ER_GLOBAL_VARIABLE
+SET @@local.slave_net_timeout = 4;
+
+
+
+--echo '#------------------FN_DYNVARS_146_05-----------------------#'
+#############################################################
+# Change the value of slave_net_timeout to an invalid value #
+#############################################################
+
+SET @@global.slave_net_timeout = -1;
+SELECT @@global.slave_net_timeout;
+
+SET @@global.slave_net_timeout = -2147483648;
+SELECT @@global.slave_net_timeout;
+
+SET @@global.slave_net_timeout = 2147483649*2;
+SELECT @@global.slave_net_timeout;
+
+--Error ER_PARSE_ERROR
+SET @@global.slave_net_timeout = 65530.34.;
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.slave_net_timeout = 100s;
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.slave_net_timeout = 7483649.56;
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.slave_net_timeout = 0.6;
+
+--echo 'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
+
+
+--echo '#------------------FN_DYNVARS_146_06-----------------------#'
+####################################################################
+# Check if the value in GLOBAL Table matches value in variable #
+####################################################################
+
+SET @@global.slave_net_timeout = 3000;
+SELECT @@global.slave_net_timeout = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='slave_net_timeout';
+
+
+--echo '#------------------FN_DYNVARS_146_07-----------------------#'
+###########################################################################
+# Check if the value is present in INFORMATION_SCHEMA.SESSION_VARIABLES #
+###########################################################################
+
+SELECT count(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='slave_net_timeout';
+
+
+--echo '#------------------FN_DYNVARS_146_08-----------------------#'
+####################################################################
+# Check if TRUE and FALSE values can be used on variable #
+####################################################################
+
+SET @@global.slave_net_timeout = TRUE;
+SELECT @@global.slave_net_timeout;
+SET @@global.slave_net_timeout = FALSE;
+SELECT @@global.slave_net_timeout;
+
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+###############################################################################
+# Check if accessing variable with and without GLOBAL point to same variable #
+###############################################################################
+
+
+SET @@global.slave_net_timeout = 60*60;
+SELECT @@slave_net_timeout = @@global.slave_net_timeout;
+
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+##########################################################################
+# Check if slave_net_timeout can be accessed without @@ sign and scope #
+##########################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET slave_net_timeout = 2048;
+--Error ER_BAD_FIELD_ERROR
+SELECT slave_net_timeout;
+
+SELECT @@slave_net_timeout;
+
+#verifying another another syntax for setting value
+SET global slave_net_timeout = 99;
+
+####################################
+# Restore initial value #
+####################################
+
+SET @@global.slave_net_timeout = @start_global_value;
+SELECT @@global.slave_net_timeout;
+
+################################################
+# END OF slave_net_timeout TESTS #
+################################################
+
diff -Nrup a/mysql-test/t/rpl_slave_transaction_retries_basic_32.test
b/mysql-test/t/rpl_slave_transaction_retries_basic_32.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_32.test 2008-05-14 19:57:18 -03:00
@@ -0,0 +1,9 @@
+################################################################################
+# Created by Horst Hunger 2008-05-07 #
+# #
+# Wrapper for 32 bit machines #
+################################################################################
+
+--source include/have_32bit.inc
+--source include/slave_transaction_retries_basic.inc
+
diff -Nrup a/mysql-test/t/rpl_slave_transaction_retries_basic_64.test
b/mysql-test/t/rpl_slave_transaction_retries_basic_64.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_64.test 2008-05-14 19:57:18 -03:00
@@ -0,0 +1,9 @@
+################################################################################
+# Created by Horst Hunger 2008-05-07 #
+# #
+# Wrapper for 64 bit machines #
+################################################################################
+
+--source include/have_64bit.inc
+--source include/slave_transaction_retries_basic.inc
+
diff -Nrup a/mysql-test/t/slave_allow_batching_basic.test
b/mysql-test/t/slave_allow_batching_basic.test
--- a/mysql-test/t/slave_allow_batching_basic.test 2008-04-10 13:22:34 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,166 +0,0 @@
-############## mysql-test\t\slave_allow_batching_basic.test ####################
-# #
-# Variable Name: slave_allow_batching #
-# Scope: GLOBAL & SESSION #
-# Access Type: Dynamic #
-# Data Type: Numeric #
-# Default Value: 1 #
-# Range: 1 - 65536 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan Maredia #
-# #
-# Description: Test Cases of Dynamic System Variable slave_allow_batching #
-# that checks the behavior of this variable in the following ways #
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-################################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-# START OF slave_allow_batching TESTS #
-########################################################################
-
-
-################################################################################
-# Saving initial value of slave_allow_batching in a temporary variable #
-################################################################################
-
-SET @global_start_value = @@global.slave_allow_batching;
-
---echo 'Bug: This variable is not supported in mysql version 5.1.22'
-
---echo '#--------------------FN_DYNVARS_145_01------------------------#'
-########################################################################
-# Display the DEFAULT value of slave_allow_batching #
-########################################################################
-
-SET @@global.slave_allow_batching = 1;
-SET @@global.slave_allow_batching = DEFAULT;
-SELECT @@global.slave_allow_batching;
-
---echo '#---------------------FN_DYNVARS_145_02-------------------------#'
-#############################################################################
-# Check if slave_allow_batching can be accessed with and without @@ sign #
-#############################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET slave_allow_batching = 1;
-SELECT @@slave_allow_batching;
---Error ER_UNKNOWN_TABLE
-SELECT global.slave_allow_batching;
-
-SET global slave_allow_batching = 1;
-SELECT @@global.slave_allow_batching;
-
-
---echo '#--------------------FN_DYNVARS_145_03------------------------#'
-########################################################################
-# Change the value of slave_allow_batching to a valid value #
-########################################################################
-
-SET @@global.slave_allow_batching = 0;
-SELECT @@global.slave_allow_batching;
-SET @@global.slave_allow_batching = 1;
-SELECT @@global.slave_allow_batching;
-
-
---echo '#--------------------FN_DYNVARS_145_04-------------------------#'
-###########################################################################
-# Change the value of slave_allow_batching to invalid value #
-###########################################################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = "T";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = YES;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = ONN;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = OOF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = 0FF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = ' 1';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_allow_batching = NO;
-
-
---echo '#-------------------FN_DYNVARS_145_05----------------------------#'
-###########################################################################
-# Test if accessing session slave_allow_batching gives error #
-###########################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET @@session.slave_allow_batching = 0;
---Error ER_GLOBAL_VARIABLE
-SET @@slave_allow_batching = 0;
---Error ER_GLOBAL_VARIABLE
-SET @@local.slave_allow_batching = 0;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@session.slave_allow_batching;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@local.slave_allow_batching;
-
---echo '#----------------------FN_DYNVARS_145_06------------------------#'
-#########################################################################
-# Check if the value in SESSION Table contains variable value #
-#########################################################################
-
-SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
-
-
---echo '#----------------------FN_DYNVARS_145_07------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#########################################################################
-
-SELECT @@global.slave_allow_batching = VARIABLE_VALUE FROM
INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='slave_allow_batching';
-SELECT @@global.slave_allow_batching;
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE
VARIABLE_NAME='slave_allow_batching';
---echo 'Bug: value in information schema does not match'
-
---echo '#---------------------FN_DYNVARS_145_08-------------------------#'
-###################################################################
-# Check if ON and OFF values can be used on variable #
-###################################################################
-
-SET @@global.slave_allow_batching = OFF;
-SELECT @@global.slave_allow_batching;
-SET @@global.slave_allow_batching = ON;
-SELECT @@global.slave_allow_batching;
-
---echo '#---------------------FN_DYNVARS_145_09----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@global.slave_allow_batching = TRUE;
-SELECT @@global.slave_allow_batching;
-SET @@global.slave_allow_batching = FALSE;
-SELECT @@global.slave_allow_batching;
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@global.slave_allow_batching = @global_start_value;
-SELECT @@global.slave_allow_batching;
-
-###############################################################
-# END OF slave_allow_batching TESTS #
-###############################################################
diff -Nrup a/mysql-test/t/slave_compressed_protocol_basic.test
b/mysql-test/t/slave_compressed_protocol_basic.test
--- a/mysql-test/t/slave_compressed_protocol_basic.test 2008-04-11 16:59:30 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,167 +0,0 @@
-############# mysql-test\t\slave_compressed_protocol_basic.test ###############
-# #
-# Variable Name: slave_compressed_protocol #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: boolean #
-# Default Value: FALSE #
-# Range: TRUE, FALSE #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable slave_compressed_protocol#
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/not_embedded.inc
---source include/load_sysvars.inc
-########################################################################
-# START OF slave_compressed_protocol TESTS #
-########################################################################
-
-
-##############################################################################
-# Saving initial value of slave_compressed_protocol in a temporary variable #
-##############################################################################
-
-SET @global_start_value = @@global.slave_compressed_protocol;
-SELECT @global_start_value;
-
---echo '#--------------------FN_DYNVARS_147_01------------------------#'
-########################################################################
-# Display the DEFAULT value of slave_compressed_protocol #
-########################################################################
-
-SET @@global.slave_compressed_protocol = 1;
-SET @@global.slave_compressed_protocol = DEFAULT;
-SELECT @@global.slave_compressed_protocol;
-
---echo '#---------------------FN_DYNVARS_147_02-------------------------#'
-###############################################################################
-# Check if slave_compressed_protocol can be accessed with and without @@ sign #
-###############################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET slave_compressed_protocol = 1;
-SELECT @@slave_compressed_protocol;
---Error ER_UNKNOWN_TABLE
-SELECT global.slave_compressed_protocol;
-
-SET global slave_compressed_protocol = 1;
-SELECT @@global.slave_compressed_protocol;
-
-
---echo '#--------------------FN_DYNVARS_147_03------------------------#'
-########################################################################
-# Change the value of slave_compressed_protocol to a valid value #
-########################################################################
-
-SET @@global.slave_compressed_protocol = 0;
-SELECT @@global.slave_compressed_protocol;
-SET @@global.slave_compressed_protocol = 1;
-SELECT @@global.slave_compressed_protocol;
-
-
---echo '#--------------------FN_DYNVARS_147_04-------------------------#'
-###########################################################################
-# Change the value of slave_compressed_protocol to invalid value #
-###########################################################################
-
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = -1;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = 2;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = "1.00";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = "Y";
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = YES;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = ONN;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = 0FF;
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = ' 1';
---Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_compressed_protocol = NO;
-
-
---echo '#-------------------FN_DYNVARS_147_05----------------------------#'
-###########################################################################
-# Test if accessing session slave_compressed_protocol gives error #
-###########################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET @@session.slave_compressed_protocol = 0;
---Error ER_GLOBAL_VARIABLE
-SET @@slave_compressed_protocol = 0;
---Error ER_GLOBAL_VARIABLE
-SET @@local.slave_compressed_protocol = 0;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@session.slave_compressed_protocol;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@local.slave_compressed_protocol;
-
---echo '#----------------------FN_DYNVARS_147_06------------------------#'
-#########################################################################
-# Check if the value in SESSION Table contains variable value #
-#########################################################################
-
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-
---echo '#----------------------FN_DYNVARS_147_07------------------------#'
-#########################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-#########################################################################
-
-SELECT @@global.slave_compressed_protocol = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-SELECT @@global.slave_compressed_protocol;
-SELECT VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_compressed_protocol';
-
---echo '#---------------------FN_DYNVARS_147_08-------------------------#'
-###################################################################
-# Check if ON and OFF values can be used on variable #
-###################################################################
-
-SET @@global.slave_compressed_protocol = OFF;
-SELECT @@global.slave_compressed_protocol;
-SET @@global.slave_compressed_protocol = ON;
-SELECT @@global.slave_compressed_protocol;
-
---echo '#---------------------FN_DYNVARS_147_09----------------------#'
-###################################################################
-# Check if TRUE and FALSE values can be used on variable #
-###################################################################
-
-SET @@global.slave_compressed_protocol = TRUE;
-SELECT @@global.slave_compressed_protocol;
-SET @@global.slave_compressed_protocol = FALSE;
-SELECT @@global.slave_compressed_protocol;
-
-##############################
-# Restore initial value #
-##############################
-
-SET @@global.slave_compressed_protocol = @global_start_value;
-SELECT @@global.slave_compressed_protocol;
-
-###############################################################
-# END OF slave_compressed_protocol TESTS #
-###############################################################
diff -Nrup a/mysql-test/t/slave_exec_mode_basic.test
b/mysql-test/t/slave_exec_mode_basic.test
--- a/mysql-test/t/slave_exec_mode_basic.test 2008-04-10 10:14:05 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,41 +0,0 @@
-############## mysql-test\t\slave_exec_mode_basic.test #########################
-# #
-# Variable Name: slave_exec_mode #
-# Scope: GLOBAL & SESSION #
-# Access Type: Dynamic #
-# Data Type: Numeric #
-# Default Value: 1 #
-# Range: 1 - 65536 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan Maredia #
-# #
-# Description: Test Cases of Dynamic System Variable slave_exec_mode #
-# that checks the behavior of this variable in the following ways #
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-################################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-# START OF slave_exec_mode TESTS #
-########################################################################
-
-
-########################################################################
-# Saving initial value of slave_exec_mode in a temporary variable #
-########################################################################
-SET @start_value = @@global.slave_exec_mode;
---echo 'This variable is not supported in version 5.1.22. It is introduced in 5.1.24'
-
-########################################################################
-# END OF slave_exec_mode TESTS #
-########################################################################
diff -Nrup a/mysql-test/t/slave_net_timeout_basic.test
b/mysql-test/t/slave_net_timeout_basic.test
--- a/mysql-test/t/slave_net_timeout_basic.test 2008-04-11 16:59:30 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,187 +0,0 @@
-################## mysql-test\t\slave_net_timeout_basic.test ##################
-# #
-# Variable Name: slave_net_timeout #
-# Scope: GLOBAL #
-# Access Type: Dynamic #
-# Data Type: numeric #
-# Default Value: 3600 #
-# Range: #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Rizwan #
-# #
-# Description: Test Cases of Dynamic System Variable slave_net_timeout #
-# that checks the behavior of this variable in the following ways#
-# * Default Value #
-# * Valid & Invalid values #
-# * Scope & Access method #
-# * Data Integrity #
-# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
-# #
-###############################################################################
-
---source include/not_embedded.inc
---source include/load_sysvars.inc
-###########################################################
-# START OF slave_net_timeout TESTS #
-###########################################################
-
-
-#############################################################
-# Save initial value #
-#############################################################
-
-SET @start_global_value = @@global.slave_net_timeout;
-SELECT @start_global_value;
-
---echo '#--------------------FN_DYNVARS_146_01-------------------------#'
-###########################################################
-# Display the DEFAULT value of slave_net_timeout #
-###########################################################
-
-SET @@global.slave_net_timeout = 500000;
-SET @@global.slave_net_timeout = DEFAULT;
-SELECT @@global.slave_net_timeout;
-
---echo '#--------------------FN_DYNVARS_146_02-------------------------#'
-############################################################
-# Check the DEFAULT value of slave_net_timeout #
-############################################################
-
-SET @@global.slave_net_timeout = DEFAULT;
-SELECT @@global.slave_net_timeout = 3600;
-
---echo '#--------------------FN_DYNVARS_146_03-------------------------#'
-###########################################################################
-# Change the value of slave_net_timeout to a valid value for GLOBAL Scope #
-###########################################################################
-
-SET @@global.slave_net_timeout = 0;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 1;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 15;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 1024;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 3600+1;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 2147483648;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = 2147483648*2-1;
-SELECT @@global.slave_net_timeout;
-
-
---echo '#--------------------FN_DYNVARS_146_04-------------------------#'
-###############################################################################
-# Check if variable can be access with session scope #
-###############################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET @@slave_net_timeout = 2;
-
---Error ER_GLOBAL_VARIABLE
-SET @@session.slave_net_timeout = 3;
-
---Error ER_GLOBAL_VARIABLE
-SET @@local.slave_net_timeout = 4;
-
-
-
---echo '#------------------FN_DYNVARS_146_05-----------------------#'
-#############################################################
-# Change the value of slave_net_timeout to an invalid value #
-#############################################################
-
-SET @@global.slave_net_timeout = -1;
-SELECT @@global.slave_net_timeout;
-
-SET @@global.slave_net_timeout = -2147483648;
-SELECT @@global.slave_net_timeout;
-
-SET @@global.slave_net_timeout = 2147483649*2;
-SELECT @@global.slave_net_timeout;
-
---Error ER_PARSE_ERROR
-SET @@global.slave_net_timeout = 65530.34.;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.slave_net_timeout = 100s;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.slave_net_timeout = 7483649.56;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.slave_net_timeout = 0.6;
-
---echo 'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
-
-
---echo '#------------------FN_DYNVARS_146_06-----------------------#'
-####################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-####################################################################
-
-SET @@global.slave_net_timeout = 3000;
-SELECT @@global.slave_net_timeout = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='slave_net_timeout';
-
-
---echo '#------------------FN_DYNVARS_146_07-----------------------#'
-###########################################################################
-# Check if the value is present in INFORMATION_SCHEMA.SESSION_VARIABLES #
-###########################################################################
-
-SELECT count(VARIABLE_VALUE)
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='slave_net_timeout';
-
-
---echo '#------------------FN_DYNVARS_146_08-----------------------#'
-####################################################################
-# Check if TRUE and FALSE values can be used on variable #
-####################################################################
-
-SET @@global.slave_net_timeout = TRUE;
-SELECT @@global.slave_net_timeout;
-SET @@global.slave_net_timeout = FALSE;
-SELECT @@global.slave_net_timeout;
-
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-###############################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-###############################################################################
-
-
-SET @@global.slave_net_timeout = 60*60;
-SELECT @@slave_net_timeout = @@global.slave_net_timeout;
-
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-##########################################################################
-# Check if slave_net_timeout can be accessed without @@ sign and scope #
-##########################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET slave_net_timeout = 2048;
---Error ER_BAD_FIELD_ERROR
-SELECT slave_net_timeout;
-
-SELECT @@slave_net_timeout;
-
-#verifying another another syntax for setting value
-SET global slave_net_timeout = 99;
-
-####################################
-# Restore initial value #
-####################################
-
-SET @@global.slave_net_timeout = @start_global_value;
-SELECT @@global.slave_net_timeout;
-
-################################################
-# END OF slave_net_timeout TESTS #
-################################################
-
diff -Nrup a/mysql-test/t/slave_transaction_retries_basic_32.test
b/mysql-test/t/slave_transaction_retries_basic_32.test
--- a/mysql-test/t/slave_transaction_retries_basic_32.test 2008-05-08 15:13:27 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 32 bit machines #
-################################################################################
-
---source include/have_32bit.inc
---source include/slave_transaction_retries_basic.inc
-
diff -Nrup a/mysql-test/t/slave_transaction_retries_basic_64.test
b/mysql-test/t/slave_transaction_retries_basic_64.test
--- a/mysql-test/t/slave_transaction_retries_basic_64.test 2008-05-08 15:13:27 -03:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 64 bit machines #
-################################################################################
-
---source include/have_64bit.inc
---source include/slave_transaction_retries_basic.inc
-
diff -Nrup a/mysql-test/t/slow_query_log_file_basic.test
b/mysql-test/t/slow_query_log_file_basic.test
--- a/mysql-test/t/slow_query_log_file_basic.test 2008-04-10 10:14:07 -03:00
+++ b/mysql-test/t/slow_query_log_file_basic.test 2008-05-14 20:24:09 -03:00
@@ -52,8 +52,10 @@ SELECT RIGHT(@@global.slow_query_log_fil
# Change the value of slow_query_log_file to a invalid value #
#######################################################################
---Error ER_WRONG_VALUE_FOR_VAR
+# Assumed text if no quotes or numbers.
SET @@global.slow_query_log_file = mytest.log;
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@global.slow_query_log_file = 12;
--echo '#----------------------FN_DYNVARS_004_03------------------------#'
##############################################################################
| Thread |
|---|
| • bk commit into 6.0 tree (davi:1.2635) | Davi Arnaut | 15 May |