2922 Horst Hunger 2008-11-26 [merge]
Due to merge.
removed:
mysql-test/suite/backup/r/backup_commit_blocker.result
mysql-test/suite/backup/t/backup_commit_blocker.test
added:
mysql-test/suite/backup/r/backup_vp_nontx.result
mysql-test/suite/backup/r/backup_vp_tx.result
mysql-test/suite/backup/t/backup_nodata_driver-master.opt
mysql-test/suite/backup/t/backup_vp_nontx.test
mysql-test/suite/backup/t/backup_vp_tx.test
modified:
mysql-test/lib/mtr_report.pl
mysql-test/r/implicit_commit.result
mysql-test/suite/backup/r/backup.result
mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/suite/backup/r/backup_commit_backup.result
mysql-test/suite/backup/r/backup_commit_restore.result
mysql-test/suite/backup/r/backup_compression.result
mysql-test/suite/backup/r/backup_concurrent.result
mysql-test/suite/backup/r/backup_db_grants.result
mysql-test/suite/backup/r/backup_ddl_blocker.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/r/backup_fkey.result
mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/r/backup_logs_output.result
mysql-test/suite/backup/r/backup_logs_purge.result
mysql-test/suite/backup/r/backup_no_be.result
mysql-test/suite/backup/r/backup_no_data.result
mysql-test/suite/backup/r/backup_nodata_driver.result
mysql-test/suite/backup/r/backup_security.result
mysql-test/suite/backup/r/backup_snapshot.result
mysql-test/suite/backup/r/backup_timeout.result
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_backupdir.test
mysql-test/suite/backup/t/backup_commit_backup.test
mysql-test/suite/backup/t/backup_commit_restore.test
mysql-test/suite/backup/t/backup_compression.test
mysql-test/suite/backup/t/backup_concurrent.test
mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/suite/backup/t/backup_ddl_blocker.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_fkey.test
mysql-test/suite/backup/t/backup_lock_myisam.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_logs_output-master.opt
mysql-test/suite/backup/t/backup_logs_purge.test
mysql-test/suite/backup/t/backup_no_be.test
mysql-test/suite/backup/t/backup_no_data.test
mysql-test/suite/backup/t/backup_nodata_driver.test
mysql-test/suite/backup/t/backup_security.test
mysql-test/suite/backup/t/backup_snapshot.test
mysql-test/suite/backup/t/backup_timeout.test
mysql-test/suite/backup_engines/include/backup_ptr_commit.inc
mysql-test/suite/backup_engines/r/backup_online_testing.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_row.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_stmt.result
mysql-test/suite/backup_engines/r/backup_tmp_tables.result
mysql-test/suite/backup_engines/t/backup_online_testing.test
mysql-test/suite/backup_engines/t/backup_tmp_tables.test
mysql-test/suite/rpl/r/rpl_backup.result
mysql-test/suite/rpl/t/rpl_backup.test
mysql-test/t/implicit_commit.test
sql/backup/backup_info.h
sql/backup/backup_kernel.h
sql/backup/kernel.cc
sql/backup/logger.h
sql/backup/restore_info.h
sql/backup/stream.h
sql/backup/stream_v1.c
sql/lex.h
sql/mysqld.cc
sql/share/errmsg.txt
sql/sql_parse.cc
sql/sql_yacc.yy
=== removed file 'mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc 1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-############## mysql-test\t\multi_range_count_basic.test ###############
-# #
-# Variable Name: multi_range_count #
-# Scope: GLOBAL | SESSION #
-# Access Type: Dynamic #
-# Data Type: numeric #
-# Default Value: 256 #
-# Range:1-4294967295 #
-# #
-# #
-# Creation Date: 2008-02-07 #
-# Author: Salman #
-# #
-# Description: Test Cases of Dynamic System Variable multi_range_count #
-# 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 multi_range_count TESTS #
-#################################################################
-
-
-#############################################################
-# Save initial value #
-#############################################################
-
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-
-
---echo '#--------------------FN_DYNVARS_090_01-------------------------#'
-#################################################################
-# Display the DEFAULT value of multi_range_count #
-#################################################################
-
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-
-
---echo '#--------------------FN_DYNVARS_090_02-------------------------#'
-#################################################################
-# Check the DEFAULT value of multi_range_count #
-#################################################################
-
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-
-
---echo '#--------------------FN_DYNVARS_090_03-------------------------#'
-###########################################################################
-# Change the value of multi_range_count to a valid value for GLOBAL Scope #
-###########################################################################
-
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-
-
-
---echo '#--------------------FN_DYNVARS_090_04-------------------------#'
-############################################################################
-# Change the value of multi_range_count to a valid value for SESSION Scope #
-############################################################################
-
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-
-
---echo '#------------------FN_DYNVARS_090_05-----------------------#'
-#############################################################
-# Change the value of multi_range_count to an invalid value #
-#############################################################
-
-SET @@global.multi_range_count = 0;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 4294967296;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = -1024;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = 429496729500;
-SELECT @@global.multi_range_count;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.multi_range_count = 65530.34;
-SELECT @@global.multi_range_count;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.multi_range_count = test;
-SELECT @@global.multi_range_count;
-
-SET @@session.multi_range_count = 0;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = 4294967296;
-SELECT @@session.multi_range_count;
-SET @@session.multi_range_count = -1;
-SELECT @@session.multi_range_count;
---Error ER_PARSE_ERROR
-SET @@session.multi_range_count = 65530.34.;
-SET @@session.multi_range_count = 4294967295021;
-SELECT @@session.multi_range_count;
---echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.multi_range_count = test;
-SELECT @@session.multi_range_count;
-
-
---echo '#------------------FN_DYNVARS_090_06-----------------------#'
-####################################################################
-# Check if the value in GLOBAL Table matches value in variable #
-####################################################################
-
-
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-
---echo '#------------------FN_DYNVARS_090_07-----------------------#'
-####################################################################
-# Check if the value in SESSION Table matches value in variable #
-####################################################################
-
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-
-
---echo '#------------------FN_DYNVARS_090_08-----------------------#'
-####################################################################
-# Check if TRUE and FALSE values can be used on variable #
-####################################################################
-
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-SET @@global.multi_range_count = FALSE;
-SELECT @@global.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_09----------------------#'
-#################################################################################
-# Check if accessing variable with and without GLOBAL point to same variable #
-#################################################################################
-
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_10----------------------#'
-########################################################################################################
-# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable #
-########################################################################################################
-
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-
-
---echo '#---------------------FN_DYNVARS_090_11----------------------#'
-############################################################################
-# Check if multi_range_count can be accessed with and without @@ sign #
-############################################################################
-
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
---Error ER_UNKNOWN_TABLE
-SELECT local.multi_range_count;
---Error ER_UNKNOWN_TABLE
-SELECT session.multi_range_count;
---Error ER_BAD_FIELD_ERROR
-SELECT multi_range_count = @@session.multi_range_count;
-
-
-####################################
-# Restore initial value #
-####################################
-
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-
-
-######################################################
-# END OF multi_range_count TESTS #
-######################################################
-
=== removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result 1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-@start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-@start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '429496729500'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@session.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 4294967296;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967296'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 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 @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '4294967295021'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@session.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-'#------------------FN_DYNVARS_090_06-----------------------#'
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@global.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_07-----------------------#'
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@session.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_08-----------------------#'
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_09----------------------#'
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-@@multi_range_count = @@global.multi_range_count
-0
-'#---------------------FN_DYNVARS_090_10----------------------#'
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-@@multi_range_count = @@local.multi_range_count
-1
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-@@local.multi_range_count = @@session.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_11----------------------#'
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
-@@multi_range_count
-1
-SELECT local.multi_range_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.multi_range_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT multi_range_count = @@session.multi_range_count;
-ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
=== removed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
-@start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
-@start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 4294967296;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967296
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@global.multi_range_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@global.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-429496729500
-SET @@session.multi_range_count = 0;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 4294967296;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967296
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 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 @@session.multi_range_count = 4294967295021;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295021
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@session.multi_range_count = test;
-ERROR 42000: Incorrect argument type to variable 'multi_range_count'
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295021
-'#------------------FN_DYNVARS_090_06-----------------------#'
-SELECT @@global.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@global.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_07-----------------------#'
-SELECT @@session.multi_range_count = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='multi_range_count';
-@@session.multi_range_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_090_08-----------------------#'
-SET @@global.multi_range_count = TRUE;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_09----------------------#'
-SET @@global.multi_range_count = 10;
-SELECT @@multi_range_count = @@global.multi_range_count;
-@@multi_range_count = @@global.multi_range_count
-0
-'#---------------------FN_DYNVARS_090_10----------------------#'
-SET @@multi_range_count = 100;
-SELECT @@multi_range_count = @@local.multi_range_count;
-@@multi_range_count = @@local.multi_range_count
-1
-SELECT @@local.multi_range_count = @@session.multi_range_count;
-@@local.multi_range_count = @@session.multi_range_count
-1
-'#---------------------FN_DYNVARS_090_11----------------------#'
-SET multi_range_count = 1;
-SELECT @@multi_range_count;
-@@multi_range_count
-1
-SELECT local.multi_range_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.multi_range_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT multi_range_count = @@session.multi_range_count;
-ERROR 42S22: Unknown column 'multi_range_count' in 'field list'
-SET @@global.multi_range_count = @start_global_value;
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
=== added file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def 2008-11-26 15:16:58 +0000
@@ -0,0 +1,21 @@
+##############################################################################
+#
+# List the test cases that are to be disabled temporarily.
+#
+# Separate the test case name and the comment with ':'.
+#
+# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+# Do not use any TAB characters for whitespace.
+#
+##############################################################################
+key_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+rpl_recovery_rank_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+sort_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_size_basic_32 : Bug#36747: Allocating a large query cache is not deterministic
+query_cache_size_basic_64 : Bug#36747: Allocating a large query cache is not deterministic
+query_alloc_block_size_basic_64: Bug #37708 query_alloc_block_size_basic_64 fails in pushbuild
+sort_buffer_size_basic_32 : Bug#36875 main.sort_buffer_size_basic_32 fails on some systems
+key_buffer_size_basic_32 : Bug#36876 main.key_buffer_size_basic_32 fails on some systems
+max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some systems
+tmp_table_size_basic_32 : Bug#36878 main.tmp_table_size_basic_32 fails on some systems
=== removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 32 bit machines #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
=== removed file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger 2008-05-07 #
-# #
-# Wrapper for 64 bit machines #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-11-07 11:45:16 +0000
+++ b/mysql-test/t/disabled.def 2008-11-26 15:16:58 +0000
@@ -9,32 +9,14 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
-innodb : WL#1213: Waiting for InnoDB team to add support for 4-byte character sets.
-concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
federated_transactions : Bug#29523 Transactions do not work
show_check : Bug #32682 Test show_check fails in 6.0
lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
-rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes
ctype_create : Bug#32965 main.ctype_create fails
-backup_no_engine : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
csv_alter_table : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
-query_cache_wlock_invalidate_func: Bug#35390 causes not deterministic results.
cast : Bug#35594 2008-03-27 main.cast fails on Windows2003-64
-maria-preload : Bug#35107 crashes
-key_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-rpl_recovery_rank_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sort_buffer_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-log_output_basic : Bug#34820 log_output can be set to illegal value
-query_cache_size_basic_32 : Bug#36747: Allocating a large query cache is not deterministic
-query_cache_size_basic_64 : Bug#36747: Allocating a large query cache is not deterministic
-query_alloc_block_size_basic_64: Bug #37708 query_alloc_block_size_basic_64 fails in pushbuild
wait_timeout_func : Bug #36873 wait_timeout_func.test fails randomly
timestamp_func : Bug #37702 timestamp_func relies on sleep and is unstable in pushbuild
-sort_buffer_size_basic_32 : Bug#36875 main.sort_buffer_size_basic_32 fails on some systems
-key_buffer_size_basic_32 : Bug#36876 main.key_buffer_size_basic_32 fails on some systems
-max_heap_table_size_basic_32 : Bug#36877 main.max_heap_table_size_basic_32 fails on some systems
-tmp_table_size_basic_32 : Bug#36878 main.tmp_table_size_basic_32 fails on some systems
-backup_triggers_and_events : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons
-backup_no_be : Bug#38023 2008-07-16 rafal Test triggers valgrind warnings described in the bug
-user_limits : Bug#23921 2008-07-25 joro random failure of user_limits.test
thread_cache_size_func : Bug#40574 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
+log_output_basic : Bug #40988 log_output_basic.test succeeded though syntactically false.
+innodb : Bug #41056 Innodb.test shows some difference to its result file.
| Thread |
|---|
| • bzr push into mysql-6.0 branch (horst:2922) | Horst Hunger | 26 Nov |
