List:Commits« Previous MessageNext Message »
From:jonas Date:August 8 2008 2:37pm
Subject:bzr commit into mysql-5.1-telco-6.2-merge branch (jonas:2656)
View as plain text  
#At file:///home/jonas/merge/mysql-6.0-ndb/

 2656 jonas@stripped	2008-08-08
      add mising files
added:
  mysql-test/r/rpl_slave_allow_batching_basic.result
  mysql-test/r/rpl_slave_compressed_protocol_basic.result
  mysql-test/r/rpl_slave_exec_mode_basic.result
  mysql-test/r/rpl_slave_net_timeout_basic.result
  mysql-test/r/rpl_slave_transaction_retries_basic_32.result
  mysql-test/r/rpl_slave_transaction_retries_basic_64.result
  mysql-test/r/rpl_sync_binlog_basic_32.result
  mysql-test/r/rpl_sync_binlog_basic_64.result
  mysql-test/suite/ndb_team/r/ndb_dd_restore_compat.result
  mysql-test/suite/ndb_team/t/ndb_dd_restore_compat.test
  mysql-test/suite/rpl/r/rpl_colSize.result
  mysql-test/t/rpl_slave_allow_batching_basic.test
  mysql-test/t/rpl_slave_compressed_protocol_basic.test
  mysql-test/t/rpl_slave_exec_mode_basic.test
  mysql-test/t/rpl_slave_net_timeout_basic.test
  mysql-test/t/rpl_slave_transaction_retries_basic_32.test
  mysql-test/t/rpl_slave_transaction_retries_basic_64.test
  mysql-test/t/rpl_sync_binlog_basic_32.test
  mysql-test/t/rpl_sync_binlog_basic_64.test

=== added file 'mysql-test/r/rpl_slave_allow_batching_basic.result'
--- a/mysql-test/r/rpl_slave_allow_batching_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_allow_batching_basic.result	2008-08-08 14:37:49 +0000
@@ -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

=== added file 'mysql-test/r/rpl_slave_compressed_protocol_basic.result'
--- a/mysql-test/r/rpl_slave_compressed_protocol_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_compressed_protocol_basic.result	2008-08-08 14:37:49 +0000
@@ -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

=== added file 'mysql-test/r/rpl_slave_exec_mode_basic.result'
--- a/mysql-test/r/rpl_slave_exec_mode_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_exec_mode_basic.result	2008-08-08 14:37:49 +0000
@@ -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'

=== added file 'mysql-test/r/rpl_slave_net_timeout_basic.result'
--- a/mysql-test/r/rpl_slave_net_timeout_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_net_timeout_basic.result	2008-08-08 14:37:49 +0000
@@ -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

=== added file 'mysql-test/r/rpl_slave_transaction_retries_basic_32.result'
--- a/mysql-test/r/rpl_slave_transaction_retries_basic_32.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_transaction_retries_basic_32.result	2008-08-08 14:37:49 +0000
@@ -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

=== added file 'mysql-test/r/rpl_slave_transaction_retries_basic_64.result'
--- a/mysql-test/r/rpl_slave_transaction_retries_basic_64.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_slave_transaction_retries_basic_64.result	2008-08-08 14:37:49 +0000
@@ -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

=== added file 'mysql-test/r/rpl_sync_binlog_basic_32.result'
--- a/mysql-test/r/rpl_sync_binlog_basic_32.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_sync_binlog_basic_32.result	2008-08-08 14:37:49 +0000
@@ -0,0 +1,105 @@
+SET @start_value = @@global.sync_binlog;
+SELECT @start_value;
+@start_value
+0
+'#--------------------FN_DYNVARS_168_01------------------------#'
+SET @@global.sync_binlog = 99;
+SET @@global.sync_binlog = DEFAULT;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+'#---------------------FN_DYNVARS_168_02-------------------------#'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog = 0;
+@@global.sync_binlog = 0
+1
+'#--------------------FN_DYNVARS_168_03------------------------#'
+SET @@global.sync_binlog = 0;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+1
+SET @@global.sync_binlog = 4294967295;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967295
+SET @@global.sync_binlog = 4294967294;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967294
+SET @@global.sync_binlog = 65536;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+65536
+'#--------------------FN_DYNVARS_168_04-------------------------#'
+SET @@global.sync_binlog = -1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 4294967296;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 10240022115;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+1650087523
+SET @@global.sync_binlog = 10000.01;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+1650087523
+SET @@global.sync_binlog = -1024;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 42949672950;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967286
+'Bug # 34837: Errors are not coming on assigning invalid values to variable';
+SET @@global.sync_binlog = ON;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967286
+SET @@global.sync_binlog = 'test';
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967286
+'#-------------------FN_DYNVARS_168_05----------------------------#'
+SET @@session.sync_binlog = 0;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
+4294967286
+'#----------------------FN_DYNVARS_168_06------------------------#'
+SELECT @@global.sync_binlog = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='sync_binlog';
+@@global.sync_binlog = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_168_07----------------------#'
+SET sync_binlog = 1;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
+4294967286
+SET local.sync_binlog = 1;
+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 'sync_binlog = 1' at line 1
+SELECT local.sync_binlog;
+ERROR 42S02: Unknown table 'local' in field list
+SET global.sync_binlog = 1;
+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 'sync_binlog = 1' at line 1
+SELECT global.sync_binlog;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT sync_binlog = @@session.sync_binlog;
+ERROR 42S22: Unknown column 'sync_binlog' in 'field list'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0

=== added file 'mysql-test/r/rpl_sync_binlog_basic_64.result'
--- a/mysql-test/r/rpl_sync_binlog_basic_64.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/rpl_sync_binlog_basic_64.result	2008-08-08 14:37:49 +0000
@@ -0,0 +1,105 @@
+SET @start_value = @@global.sync_binlog;
+SELECT @start_value;
+@start_value
+0
+'#--------------------FN_DYNVARS_168_01------------------------#'
+SET @@global.sync_binlog = 99;
+SET @@global.sync_binlog = DEFAULT;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+'#---------------------FN_DYNVARS_168_02-------------------------#'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog = 0;
+@@global.sync_binlog = 0
+1
+'#--------------------FN_DYNVARS_168_03------------------------#'
+SET @@global.sync_binlog = 0;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+1
+SET @@global.sync_binlog = 4294967295;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967295
+SET @@global.sync_binlog = 4294967294;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967294
+SET @@global.sync_binlog = 65536;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+65536
+'#--------------------FN_DYNVARS_168_04-------------------------#'
+SET @@global.sync_binlog = -1;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 4294967296;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+4294967296
+SET @@global.sync_binlog = 10240022115;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+10240022115
+SET @@global.sync_binlog = 10000.01;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+10240022115
+SET @@global.sync_binlog = -1024;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0
+SET @@global.sync_binlog = 42949672950;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+42949672950
+'Bug # 34837: Errors are not coming on assigning invalid values to variable';
+SET @@global.sync_binlog = ON;
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+42949672950
+SET @@global.sync_binlog = 'test';
+ERROR 42000: Incorrect argument type to variable 'sync_binlog'
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+42949672950
+'#-------------------FN_DYNVARS_168_05----------------------------#'
+SET @@session.sync_binlog = 0;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
+42949672950
+'#----------------------FN_DYNVARS_168_06------------------------#'
+SELECT @@global.sync_binlog = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='sync_binlog';
+@@global.sync_binlog = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_168_07----------------------#'
+SET sync_binlog = 1;
+ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
+SELECT @@sync_binlog;
+@@sync_binlog
+42949672950
+SET local.sync_binlog = 1;
+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 'sync_binlog = 1' at line 1
+SELECT local.sync_binlog;
+ERROR 42S02: Unknown table 'local' in field list
+SET global.sync_binlog = 1;
+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 'sync_binlog = 1' at line 1
+SELECT global.sync_binlog;
+ERROR 42S02: Unknown table 'global' in field list
+SELECT sync_binlog = @@session.sync_binlog;
+ERROR 42S22: Unknown column 'sync_binlog' in 'field list'
+SET @@global.sync_binlog = @start_value;
+SELECT @@global.sync_binlog;
+@@global.sync_binlog
+0

=== added file 'mysql-test/suite/ndb_team/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb_team/r/ndb_dd_restore_compat.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_team/r/ndb_dd_restore_compat.result	2008-08-08 14:37:49 +0000
@@ -0,0 +1,53 @@
+select * from information_schema.columns
+where table_name = "t1";
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT	STORAGE	FORMAT
+NULL	test	t1	a1	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(6)	PRI		select,insert,update,references		Default	Default
+NULL	test	t1	a2	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references		Default	Default
+NULL	test	t1	a3	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references		Default	Default
+NULL	test	t1	a4	4	NULL	YES	char	10	10	NULL	NULL	latin1	latin1_swedish_ci	char(10)			select,insert,update,references		Default	Default
+NULL	test	t1	a5	5	NULL	YES	decimal	NULL	NULL	5	1	NULL	NULL	decimal(5,1)			select,insert,update,references		Default	Default
+NULL	test	t1	a6	6	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references		Default	Default
+NULL	test	t1	a7	7	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references		Default	Default
+NULL	test	t1	a8	8	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references		Default	Default
+NULL	test	t1	a9	9	NULL	YES	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references		Default	Default
+NULL	test	t1	a10	10	NULL	YES	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references		Default	Default
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a1` smallint(6) NOT NULL,
+  `a2` int(11) NOT NULL,
+  `a3` bigint(20) NOT NULL,
+  `a4` char(10) DEFAULT NULL,
+  `a5` decimal(5,1) DEFAULT NULL,
+  `a6` time DEFAULT NULL,
+  `a7` date DEFAULT NULL,
+  `a8` datetime DEFAULT NULL,
+  `a9` varchar(255) DEFAULT NULL,
+  `a10` blob,
+  PRIMARY KEY (`a1`)
+) /*!50100 TABLESPACE `ts` */ ENGINE=ndbcluster DEFAULT CHARSET=latin1
+a1 Smallint PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
+a2 Int NOT NULL AT=FIXED ST=DISK
+a3 Bigint NOT NULL AT=FIXED ST=DISK
+a4 Char(10;latin1_swedish_ci) NULL AT=FIXED ST=DISK
+a5 Decimal(5,1) NULL AT=FIXED ST=DISK
+a6 Time NULL AT=FIXED ST=DISK
+a7 Date NULL AT=FIXED ST=DISK
+a8 Datetime NULL AT=FIXED ST=DISK
+a9 Varchar(255;latin1_swedish_ci) NULL AT=FIXED ST=DISK
+a10 Blob(256,2000,16) NULL AT=FIXED ST=DISK BV=1
+select * from t1 order by a1;
+a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
+1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
+2	3	2000000002	aaa2	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb2	binary data
+3	4	2000000003	aaa3	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb3	binary data
+4	5	2000000004	aaa4	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb4	binary data
+5	6	2000000005	aaa5	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb5	binary data
+drop table t1;
+ALTER TABLESPACE ts
+DROP DATAFILE 'datafile.dat'
+ENGINE NDB;
+drop tablespace ts
+engine ndb;
+drop logfile group lg
+engine ndb;

=== added file 'mysql-test/suite/ndb_team/t/ndb_dd_restore_compat.test'
--- a/mysql-test/suite/ndb_team/t/ndb_dd_restore_compat.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_team/t/ndb_dd_restore_compat.test	2008-08-08 14:37:49 +0000
@@ -0,0 +1,22 @@
+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -p 1 -m -r $MYSQL_TEST_DIR/std_data/ndb_backup51_dd >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -e -b 1 -n 2 -p 1 -r $MYSQL_TEST_DIR/std_data/ndb_backup51_dd >> $NDB_TOOLS_OUTPUT
+
+select * from information_schema.columns
+where table_name = "t1";
+show create table t1;
+--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t1 | grep 'ST='
+select * from t1 order by a1;
+drop table t1;
+
+ALTER TABLESPACE ts
+DROP DATAFILE 'datafile.dat'
+ENGINE NDB;
+
+drop tablespace ts
+engine ndb;
+
+drop logfile group lg
+engine ndb;

=== added file 'mysql-test/suite/rpl/r/rpl_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_colSize.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_colSize.result	2008-08-08 14:37:49 +0000
@@ -0,0 +1,179 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+DROP TABLE IF EXISTS t1;
+**** Testing WL#3228 changes. ****
+*** Create "wider" table on slave ***
+STOP SLAVE;
+RESET SLAVE;
+CREATE TABLE t1 (
+a float     (47),
+b double    (143,9),
+c decimal   (65,30),
+d numeric   (4,0),
+e bit       (32),
+f char      (21),
+g varchar   (1300),
+h binary    (33),
+j varbinary (200),
+k enum      ('5','6','7', '8','9','0'),
+l set       ('1','2','3','4','5','6','7','8','9','0','11','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29'),
+m TINYBLOB,
+n BLOB,
+o MEDIUMBLOB,
+p LONGBLOB,
+q TINYTEXT,
+r TEXT,
+s MEDIUMTEXT,
+t LONGTEXT
+);
+*** Create same table on master but with narrow columns ***
+CREATE TABLE t1 (
+a float     (44),
+b double    (10,3),
+c decimal   (10,2),
+d numeric   (3,0),
+e bit       (16),
+f char      (10),
+g varchar   (100),
+h binary    (20),
+j varbinary (20),
+k enum      ('5','6','7'),
+l set       ('1','2','3','4','5','6','7','8','9','0'),
+m TINYBLOB,
+n BLOB,
+o MEDIUMBLOB,
+p LONGBLOB,
+q TINYTEXT,
+r TEXT,
+s MEDIUMTEXT,
+t LONGTEXT
+);
+RESET MASTER;
+*** Start replication ***
+START SLAVE;
+*** Insert data on master and display it. ***
+INSERT INTO t1 () VALUES (
+17.567, 
+2.123, 
+10.20, 
+125,
+hex(64),
+'TEST',
+'This is a test',
+'binary data',
+'more binary data',
+'6',
+'7',
+"blob 1",
+"blob  2",
+"blob   3",
+"blob    4",
+"text 1",
+"text  2",
+"text   3",
+"text    4");
+SELECT * FROM t1 ORDER BY a;
+a	b	c	d	e	f	g	h	j	k	l	m	n	o	p	q	r	s	t
+17.567	2.123	10.20	125	#	TEST	This is a test	#	more binary data	6	7	blob 1	blob  2	blob   3	blob    4	text 1	text  2	text   3	text    4
+*** Select data from slave to compare ***
+SELECT * FROM t1 ORDER BY a;
+a	b	c	d	e	f	g	h	j	k	l	m	n	o	p	q	r	s	t
+17.567	2.123000000	10.200000000000000000000000000000	125	#	TEST	This is a test	#	more binary data	6	7	blob 1	blob  2	blob   3	blob    4	text 1	text  2	text   3	text    4
+DROP TABLE t1;
+Create varchar table on master
+CREATE TABLE t1 (
+a VARCHAR(50),
+b VARCHAR(100),
+c VARCHAR(300),
+d CHAR(5)
+);
+Alter varchar table on slave
+ALTER TABLE t1 CHANGE COLUMN a a VARCHAR(100);
+ALTER TABLE t1 CHANGE COLUMN b b VARCHAR(400);
+ALTER TABLE t1 CHANGE COLUMN c c VARCHAR(500);
+ALTER TABLE t1 CHANGE COLUMN d d CHAR(100);
+Insert some values and select them on master
+INSERT INTO t1 VALUES ("This is a test of col a.", 
+"This is another test of col b.",
+"This is a test of the large col c.",
+"Col d");
+SELECT * FROM t1;
+a	b	c	d
+This is a test of col a.	This is another test of col b.	This is a test of the large col c.	Col d
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(50) DEFAULT NULL,
+  `b` varchar(100) DEFAULT NULL,
+  `c` varchar(300) DEFAULT NULL,
+  `d` char(5) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+Insert some values and select them on slave
+SELECT * FROM t1;
+a	b	c	d
+This is a test of col a.	This is another test of col b.	This is a test of the large col c.	Col d
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(100) DEFAULT NULL,
+  `b` varchar(400) DEFAULT NULL,
+  `c` varchar(500) DEFAULT NULL,
+  `d` char(100) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+Create bit table on master
+CREATE TABLE t1 (
+a BIT(7),
+b BIT(8),
+c BIT(21),
+d BIT(11),
+e BIT(11)
+);
+Create bit table on slave
+DROP TABLE t1;
+CREATE TABLE t1 (
+a BIT(16),
+b BIT(22),
+c BIT(54),
+d BIT(25),
+e BIT(13)
+);
+Insert some values and select them on master
+INSERT INTO t1 VALUES (
+b'1010101',
+b'10101011',
+b'101010110101010101111',
+b'10101010101',
+b'10101011111'
+  );
+SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1;
+BIN(a)	BIN(b)	BIN(c)	BIN(d)	BIN(e)
+1010101	10101011	101010110101010101111	10101010101	10101011111
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bit(7) DEFAULT NULL,
+  `b` bit(8) DEFAULT NULL,
+  `c` bit(21) DEFAULT NULL,
+  `d` bit(11) DEFAULT NULL,
+  `e` bit(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+Insert some values and select them on master
+SELECT BIN(a), BIN(b), BIN(c), BIN(d), BIN(e) FROM t1;
+BIN(a)	BIN(b)	BIN(c)	BIN(d)	BIN(e)
+1010101	10101011	101010110101010101111	10101010101	10101011111
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bit(16) DEFAULT NULL,
+  `b` bit(22) DEFAULT NULL,
+  `c` bit(54) DEFAULT NULL,
+  `d` bit(25) DEFAULT NULL,
+  `e` bit(13) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+*** Cleanup  ***
+DROP TABLE t1;

=== added file 'mysql-test/t/rpl_slave_allow_batching_basic.test'
--- a/mysql-test/t/rpl_slave_allow_batching_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_allow_batching_basic.test	2008-08-08 14:37:49 +0000
@@ -0,0 +1,168 @@
+############## 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/not_embedded.inc
+--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;
+SELECT @global_start_value;
+
+--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';
+<<<<<<< HEAD:mysql-test/t/rpl_slave_allow_batching_basic.test
+--echo 'Bug: value in information schema does not match'
+=======
+>>>>>>> ccbd9be3264a01162bf5dd0436855cb6bd937ae7:mysql-test/t/slave_allow_batching_basic.test
+
+--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        #
+############################################################### 

=== added file 'mysql-test/t/rpl_slave_compressed_protocol_basic.test'
--- a/mysql-test/t/rpl_slave_compressed_protocol_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_compressed_protocol_basic.test	2008-08-08 14:37:49 +0000
@@ -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   #
+############################################################### 

=== added file 'mysql-test/t/rpl_slave_exec_mode_basic.test'
--- a/mysql-test/t/rpl_slave_exec_mode_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_exec_mode_basic.test	2008-08-08 14:37:49 +0000
@@ -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                      #
+######################################################################## 

=== added file 'mysql-test/t/rpl_slave_net_timeout_basic.test'
--- a/mysql-test/t/rpl_slave_net_timeout_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_net_timeout_basic.test	2008-08-08 14:37:49 +0000
@@ -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  #
+################################################
+

=== added file 'mysql-test/t/rpl_slave_transaction_retries_basic_32.test'
--- a/mysql-test/t/rpl_slave_transaction_retries_basic_32.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_32.test	2008-08-08 14:37:49 +0000
@@ -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
+

=== added file 'mysql-test/t/rpl_slave_transaction_retries_basic_64.test'
--- a/mysql-test/t/rpl_slave_transaction_retries_basic_64.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_slave_transaction_retries_basic_64.test	2008-08-08 14:37:49 +0000
@@ -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
+

=== added file 'mysql-test/t/rpl_sync_binlog_basic_32.test'
--- a/mysql-test/t/rpl_sync_binlog_basic_32.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_sync_binlog_basic_32.test	2008-08-08 14:37:49 +0000
@@ -0,0 +1,9 @@
+################################################################################
+# Created by Horst Hunger      2008-05-07                                      #
+#                                                                              #
+# Wrapper for 32 bit machines                                                  #
+################################################################################
+
+--source include/have_32bit.inc
+--source include/sync_binlog_basic.inc
+

=== added file 'mysql-test/t/rpl_sync_binlog_basic_64.test'
--- a/mysql-test/t/rpl_sync_binlog_basic_64.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/rpl_sync_binlog_basic_64.test	2008-08-08 14:37:49 +0000
@@ -0,0 +1,9 @@
+################################################################################
+# Created by Horst Hunger      2008-05-07                                      #
+#                                                                              #
+# Wrapper for 64 bit machines                                                  #
+################################################################################
+
+--source include/have_64bit.inc
+--source include/sync_binlog_basic.inc
+

Thread
bzr commit into mysql-5.1-telco-6.2-merge branch (jonas:2656) jonas8 Aug