[Commits] Rev 3365: Dependency of tests from ulong size removed. in file:///home/bell/maria/bzr/work-maria-5.5-MDEV-219-1/

sanja at montyprogram.com sanja at montyprogram.com
Thu Apr 19 16:00:48 EEST 2012


At file:///home/bell/maria/bzr/work-maria-5.5-MDEV-219-1/

------------------------------------------------------------
revno: 3365
revision-id: sanja at montyprogram.com-20120419130044-inzqd6nnksyhcpa1
parent: sergii at pisem.net-20120405135727-1kxtscd76rq6xw5o
committer: sanja at montyprogram.com
branch nick: work-maria-5.5-MDEV-219-1
timestamp: Thu 2012-04-19 16:00:44 +0300
message:
  Dependency of tests from ulong size removed.
-------------- next part --------------
=== removed file 'mysql-test/include/have_32bit_ulong.inc'
--- a/mysql-test/include/have_32bit_ulong.inc	2012-03-27 23:04:46 +0000
+++ b/mysql-test/include/have_32bit_ulong.inc	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Created by Horst Hunger     2008-04-15
-# see also have_64bit_ulong.inc
-
---disable_query_log
---disable_warnings
-let $save = `SELECT @@pseudo_thread_id`;
-SET @@pseudo_thread_id = 4294967296;
-let $mach32 = `SELECT @@pseudo_thread_id <= 4294967295`;
-eval SET @@pseudo_thread_id = $save;
---enable_warnings
---enable_query_log
-if (!$mach32)
-{
-  skip Need a 32 bit unsigned long;
-}
-

=== removed file 'mysql-test/include/have_64bit_ulong.inc'
--- a/mysql-test/include/have_64bit_ulong.inc	2012-03-27 23:04:46 +0000
+++ b/mysql-test/include/have_64bit_ulong.inc	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Created by Horst Hunger       2008-04-15
-# see also have_32bit_ulong.inc
-
---disable_query_log
-let $save = `SELECT @@pseudo_thread_id`;
-SET @@pseudo_thread_id = 4294967296;
-let $mach64 = `SELECT @@pseudo_thread_id > 4294967295`;
-eval SET @@pseudo_thread_id = $save;
---enable_query_log
-if (!$mach64)
-{
-  skip Need a 64 unsigned long ;
-}
-

=== modified file 'mysql-test/r/query_cache.result'
--- a/mysql-test/r/query_cache.result	2012-01-16 19:16:35 +0000
+++ b/mysql-test/r/query_cache.result	2012-04-19 13:00:44 +0000
@@ -442,9 +442,11 @@ show global variables like "query_cache_
 Variable_name	Value
 query_cache_min_res_unit	4096
 set GLOBAL query_cache_min_res_unit=1001;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_min_res_unit value: '1001'
 show global variables like "query_cache_min_res_unit";
 Variable_name	Value
-query_cache_min_res_unit	1008
+query_cache_min_res_unit	1000
 create table t1 (a int not null);
 insert into t1 values (1),(2),(3);
 create table t2 (a int not null);

=== removed file 'mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-############### mysql-test\t\delayed_insert_limit_basic.test ###################
-#                                                                              #
-# Variable Name: delayed_insert_limit                                          #
-# Scope: GLOBAL                                                                #
-# Access Type: Dynamic                                                         #
-# Data Type: Numeric                                                           #
-# Default Value: 100                                                           #
-# Range: 1 - 4294967295                                                        #
-#                                                                              #
-#                                                                              #
-# Creation Date: 2008-02-07                                                    #
-# Author:  Salman Rawala                                                       #
-#                                                                              #
-# Description: Test Cases of Dynamic System Variable "delayed_insert_limit"    #
-#              that checks 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#option_mysqld_delayed_insert_limit       #
-#                                                                              #
-################################################################################
-
---source include/load_sysvars.inc
-
-#################################################################
-#           START OF delayed_insert_limit TESTS                 #
-#################################################################
-
-#########################################################################
-# Saving initial value of delayed_insert_limit in a temporary variable  #
-#########################################################################
-
-SET @start_value = @@global.delayed_insert_limit;
-SELECT @start_value;
-
---echo '#--------------------FN_DYNVARS_024_01------------------------#'
-######################################################################### 
-#              Display the DEFAULT value of delayed_insert_limit        #
-######################################################################### 
-
-SET @@global.delayed_insert_limit = 100;
-SET @@global.delayed_insert_limit = DEFAULT;
-SELECT @@global.delayed_insert_limit;
-
-
---echo '#---------------------FN_DYNVARS_024_02-------------------------#'
-############################################### 
-#     Verify default value of variable        #
-############################################### 
-
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit = 100;
-
-
---echo '#--------------------FN_DYNVARS_024_03------------------------#'
-#########################################################################
-#        Change the value of delayed_insert_limit to a valid value      #
-#########################################################################
-
-SET @@global.delayed_insert_limit = 10000;
-SELECT @@global.delayed_insert_limit;
-SET @@global.delayed_insert_limit = 4294967295;
-SELECT @@global.delayed_insert_limit;
-SET @@global.delayed_insert_limit = 1;
-SELECT @@global.delayed_insert_limit;
-
-
---echo '#--------------------FN_DYNVARS_024_04-------------------------#'
-############################################################################
-#         Change the value of delayed_insert_limit to invalid value        #
-############################################################################ 
-
-SET @@global.delayed_insert_limit = 0;
-SELECT @@global.delayed_insert_limit;
-SET @@global.delayed_insert_limit = -1024;
-SELECT @@global.delayed_insert_limit;
-SET @@global.delayed_insert_limit = 42949672950;
-SELECT @@global.delayed_insert_limit;
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.delayed_insert_limit = 429496729.5;
-SELECT @@global.delayed_insert_limit;
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.delayed_insert_limit = ON;
-SELECT @@global.delayed_insert_limit;
-
-
-
---echo '#-------------------FN_DYNVARS_024_05----------------------------#'
-############################################################################
-#       Test if accessing session delayed_insert_limit gives error         #
-############################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET @@session.delayed_insert_limit = 0;
---Error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@Session.delayed_insert_limit;
-
-
---echo '#----------------------FN_DYNVARS_024_06------------------------#'
-############################################################################## 
-# Check if the value in GLOBAL & SESSION Tables matches values in variable   #
-##############################################################################
-
-SELECT @@global.delayed_insert_limit =
- VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-  WHERE VARIABLE_NAME='delayed_insert_limit';
-
-SELECT @@delayed_insert_limit =
- VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-  WHERE VARIABLE_NAME='delayed_insert_limit';
-
-
---echo '#---------------------FN_DYNVARS_024_07----------------------#'
-################################################################### 
-#      Check if TRUE and FALSE values can be used on variable     #
-################################################################### 
-
-SET @@global.delayed_insert_limit = TRUE;
-SELECT @@global.delayed_insert_limit;
-SET @@global.delayed_insert_limit = FALSE;
-SELECT @@global.delayed_insert_limit;
-
---echo '#---------------------FN_DYNVARS_024_08----------------------#'
-########################################################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable  #
-########################################################################################################
-
-SET @@global.delayed_insert_limit = 1;
-SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
-
-
---echo '#---------------------FN_DYNVARS_024_09----------------------#'
-##############################################################################
-#   Check if delayed_insert_limit can be accessed with and without @@ sign   #
-##############################################################################
-
---Error ER_GLOBAL_VARIABLE
-SET delayed_insert_limit = 1;
-SELECT @@delayed_insert_limit;
---Error ER_PARSE_ERROR
-SET local.delayed_insert_limit = 1;
---Error ER_UNKNOWN_TABLE
-SELECT local.delayed_insert_limit;
---Error ER_PARSE_ERROR
-SET global.delayed_insert_limit = 1;
---Error ER_UNKNOWN_TABLE
-SELECT global.delayed_insert_limit;
---Error ER_BAD_FIELD_ERROR
-SELECT delayed_insert_limit = @@session.delayed_insert_limit;
-
-##############################
-#   Restore initial value    #
-##############################
-
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit;
-
-
-###########################################################
-#           END OF delayed_insert_limit TESTS             #
-###########################################################
-

=== renamed file 'mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/binlog_cache_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-SET @start_value = @@global.binlog_cache_size;
-SELECT @start_value;
- at start_value
-32768
-'#--------------------FN_DYNVARS_006_01------------------------#'
-SET @@global.binlog_cache_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '100'
-SET @@global.binlog_cache_size = DEFAULT;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-32768
-'#---------------------FN_DYNVARS_006_02-------------------------#'
-SET @@global.binlog_cache_size = @start_value;
-SELECT @@global.binlog_cache_size = 32768;
-@@global.binlog_cache_size = 32768
-1
-'#--------------------FN_DYNVARS_006_03------------------------#'
-SET @@global.binlog_cache_size = 4096;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '4294967295'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4294963200
-SET @@global.binlog_cache_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '10000'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-8192
-SET @@global.binlog_cache_size = 21221204;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '21221204'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-21217280
-'Bug: Invalid values are coming in variable on assigning valid values'
-'#--------------------FN_DYNVARS_006_04-------------------------#'
-SET @@global.binlog_cache_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1024'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-SET @@global.binlog_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '-1024'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '42949672950'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-42949668864
-'Bug: Errors are not coming on assigning invalid values to variable'
-SET @@global.binlog_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-SET @@global.binlog_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
-'#-------------------FN_DYNVARS_006_05----------------------------#'
-SET @@session.binlog_cache_size = 0;
-ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#----------------------FN_DYNVARS_006_06------------------------#'
-SELECT @@global.binlog_cache_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_cache_size';
-@@global.binlog_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_006_07----------------------#'
-SET @@global.binlog_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-SET @@global.binlog_cache_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '0'
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-4096
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable'
-'#---------------------FN_DYNVARS_006_08----------------------#'
-SET @@global.binlog_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect binlog_cache_size value: '1'
-SELECT @@binlog_cache_size = @@global.binlog_cache_size;
-@@binlog_cache_size = @@global.binlog_cache_size
-1
-'#---------------------FN_DYNVARS_006_09----------------------#'
-SET binlog_cache_size = 1;
-ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET global.binlog_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1
-SELECT global.binlog_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT binlog_cache_size = @@session.binlog_cache_size;
-ERROR 42S22: Unknown column 'binlog_cache_size' in 'field list'
-SET @@global.binlog_cache_size = @start_value;
-SELECT @@global.binlog_cache_size;
-@@global.binlog_cache_size
-32768

=== renamed file 'mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-SET @start_value = @@global.binlog_stmt_cache_size;
-SELECT @start_value;
- at start_value
-32768
-'#--------------------FN_DYNVARS_006_01------------------------#'
-SET @@global.binlog_stmt_cache_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '100'
-SET @@global.binlog_stmt_cache_size = DEFAULT;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-32768
-'#---------------------FN_DYNVARS_006_02-------------------------#'
-SET @@global.binlog_stmt_cache_size = @start_value;
-SELECT @@global.binlog_stmt_cache_size = 32768;
-@@global.binlog_stmt_cache_size = 32768
-1
-'#--------------------FN_DYNVARS_006_03------------------------#'
-SET @@global.binlog_stmt_cache_size = 4096;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '4294967295'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4294963200
-SET @@global.binlog_stmt_cache_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '10000'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-8192
-SET @@global.binlog_stmt_cache_size = 21221204;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '21221204'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-21217280
-'Bug: Invalid values are coming in variable on assigning valid values'
-'#--------------------FN_DYNVARS_006_04-------------------------#'
-SET @@global.binlog_stmt_cache_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1024'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-SET @@global.binlog_stmt_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '-1024'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '42949672950'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-42949668864
-'Bug: Errors are not coming on assigning invalid values to variable'
-SET @@global.binlog_stmt_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-SET @@global.binlog_stmt_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size'
-'#-------------------FN_DYNVARS_006_05----------------------------#'
-SET @@session.binlog_stmt_cache_size = 0;
-ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#----------------------FN_DYNVARS_006_06------------------------#'
-SELECT @@global.binlog_stmt_cache_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='binlog_stmt_cache_size';
-@@global.binlog_stmt_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_006_07----------------------#'
-SET @@global.binlog_stmt_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-SET @@global.binlog_stmt_cache_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '0'
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-4096
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable'
-'#---------------------FN_DYNVARS_006_08----------------------#'
-SET @@global.binlog_stmt_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect binlog_stmt_cache_size value: '1'
-SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size;
-@@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size
-1
-'#---------------------FN_DYNVARS_006_09----------------------#'
-SET binlog_stmt_cache_size = 1;
-ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET global.binlog_stmt_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1
-SELECT global.binlog_stmt_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size;
-ERROR 42S22: Unknown column 'binlog_stmt_cache_size' in 'field list'
-SET @@global.binlog_stmt_cache_size = @start_value;
-SELECT @@global.binlog_stmt_cache_size;
-@@global.binlog_stmt_cache_size
-32768

=== renamed file 'mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-SET @start_global_value = @@global.bulk_insert_buffer_size;
-SELECT @start_global_value;
- at start_global_value
-8388608
-SET @start_session_value = @@session.bulk_insert_buffer_size;
-SELECT @start_session_value;
- at start_session_value
-8388608
-'#--------------------FN_DYNVARS_007_01-------------------------#'
-SET @@global.bulk_insert_buffer_size = 100;
-SET @@global.bulk_insert_buffer_size = DEFAULT;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-8388608
-SET @@session.bulk_insert_buffer_size = 200;
-SET @@session.bulk_insert_buffer_size = DEFAULT;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-8388608
-'#--------------------FN_DYNVARS_007_02-------------------------#'
-SET @@global.bulk_insert_buffer_size = @start_global_value;
-SELECT @@global.bulk_insert_buffer_size = 8388608;
-@@global.bulk_insert_buffer_size = 8388608
-1
-SET @@session.bulk_insert_buffer_size = @start_session_value;
-SELECT @@session.bulk_insert_buffer_size = 8388608;
-@@session.bulk_insert_buffer_size = 8388608
-1
-'#--------------------FN_DYNVARS_007_03-------------------------#'
-SET @@global.bulk_insert_buffer_size = 0;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@global.bulk_insert_buffer_size = 1;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-1
-SET @@global.bulk_insert_buffer_size = 4294967295;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-4294967295
-SET @@global.bulk_insert_buffer_size = 429496;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-429496
-'#--------------------FN_DYNVARS_007_04-------------------------#'
-SET @@session.bulk_insert_buffer_size = 0;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = 1;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-1
-SET @@session.bulk_insert_buffer_size = 4294967295;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-4294967295
-SET @@session.bulk_insert_buffer_size = 429496;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-429496
-'#------------------FN_DYNVARS_007_05-----------------------#'
-SET @@global.bulk_insert_buffer_size = 42949672950;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-42949672950
-SET @@global.bulk_insert_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-1024'
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@global.bulk_insert_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@global.bulk_insert_buffer_size = ON;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@global.bulk_insert_buffer_size = 429496.10;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@session.bulk_insert_buffer_size = 42949672950;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-42949672950
-SET @@session.bulk_insert_buffer_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-SET @@session.bulk_insert_buffer_size = 429496.10;
-ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
-'#------------------FN_DYNVARS_007_06-----------------------#'
-SELECT @@global.bulk_insert_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='bulk_insert_buffer_size';
-@@global.bulk_insert_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_007_07-----------------------#'
-SELECT @@session.bulk_insert_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='bulk_insert_buffer_size';
-@@session.bulk_insert_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_007_08-----------------------#'
-SET @@global.bulk_insert_buffer_size = TRUE;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-1
-SET @@global.bulk_insert_buffer_size = FALSE;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-0
-SET @@session.bulk_insert_buffer_size = TRUE;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-1
-SET @@session.bulk_insert_buffer_size = FALSE;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-0
-'#---------------------FN_DYNVARS_007_09----------------------#'
-SET @@bulk_insert_buffer_size = 100;
-SELECT @@bulk_insert_buffer_size = @@local.bulk_insert_buffer_size;
-@@bulk_insert_buffer_size = @@local.bulk_insert_buffer_size
-1
-SELECT @@local.bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
-@@local.bulk_insert_buffer_size = @@session.bulk_insert_buffer_size
-1
-'#---------------------FN_DYNVARS_007_10----------------------#'
-SET bulk_insert_buffer_size = 1;
-SELECT @@bulk_insert_buffer_size;
-@@bulk_insert_buffer_size
-1
-SET local.bulk_insert_buffer_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
-SELECT local.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET session.bulk_insert_buffer_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1
-SELECT session.bulk_insert_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size;
-ERROR 42S22: Unknown column 'bulk_insert_buffer_size' in 'field list'
-SET @@global.bulk_insert_buffer_size = @start_global_value;
-SELECT @@global.bulk_insert_buffer_size;
-@@global.bulk_insert_buffer_size
-8388608
-SET @@session.bulk_insert_buffer_size = @start_session_value;
-SELECT @@session.bulk_insert_buffer_size;
-@@session.bulk_insert_buffer_size
-8388608

=== renamed file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result' => 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-SET @start_value = @@global.delayed_insert_limit;
-SELECT @start_value;
- at start_value
-100
-'#--------------------FN_DYNVARS_024_01------------------------#'
-SET @@global.delayed_insert_limit = 100;
-SET @@global.delayed_insert_limit = DEFAULT;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-100
-'#---------------------FN_DYNVARS_024_02-------------------------#'
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit = 100;
-@@global.delayed_insert_limit = 100
-1
-'#--------------------FN_DYNVARS_024_03------------------------#'
-SET @@global.delayed_insert_limit = 10000;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-10000
-SET @@global.delayed_insert_limit = 4294967295;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = 1;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-'#--------------------FN_DYNVARS_024_04-------------------------#'
-SET @@global.delayed_insert_limit = 0;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '-1024'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '42949672950'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = 429496729.5;
-ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-SET @@global.delayed_insert_limit = ON;
-ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-4294967295
-'#-------------------FN_DYNVARS_024_05----------------------------#'
-SET @@session.delayed_insert_limit = 0;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@Session.delayed_insert_limit;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable
-'#----------------------FN_DYNVARS_024_06------------------------#'
-SELECT @@global.delayed_insert_limit =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='delayed_insert_limit';
-@@global.delayed_insert_limit =
-VARIABLE_VALUE
-1
-SELECT @@delayed_insert_limit =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='delayed_insert_limit';
-@@delayed_insert_limit =
-VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_024_07----------------------#'
-SET @@global.delayed_insert_limit = TRUE;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-SET @@global.delayed_insert_limit = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect delayed_insert_limit value: '0'
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-1
-'#---------------------FN_DYNVARS_024_08----------------------#'
-SET @@global.delayed_insert_limit = 1;
-SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
-@@delayed_insert_limit = @@global.delayed_insert_limit
-1
-'#---------------------FN_DYNVARS_024_09----------------------#'
-SET delayed_insert_limit = 1;
-ERROR HY000: Variable 'delayed_insert_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@delayed_insert_limit;
-@@delayed_insert_limit
-1
-SET local.delayed_insert_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
-SELECT local.delayed_insert_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.delayed_insert_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1
-SELECT global.delayed_insert_limit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT delayed_insert_limit = @@session.delayed_insert_limit;
-ERROR 42S22: Unknown column 'delayed_insert_limit' in 'field list'
-SET @@global.delayed_insert_limit = @start_value;
-SELECT @@global.delayed_insert_limit;
-@@global.delayed_insert_limit
-100

=== renamed file 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-SET @start_value = @@global.delayed_queue_size;
-SELECT @start_value;
- at start_value
-1000
-'#--------------------FN_DYNVARS_026_01------------------------#'
-SET @@global.delayed_queue_size = 100;
-SET @@global.delayed_queue_size = DEFAULT;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1000
-'#---------------------FN_DYNVARS_026_02-------------------------#'
-SET @@global.delayed_queue_size = @start_value;
-SELECT @@global.delayed_queue_size = 1000;
-@@global.delayed_queue_size = 1000
-1
-'#--------------------FN_DYNVARS_026_03------------------------#'
-SET @@global.delayed_queue_size = 10000;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-10000
-SET @@global.delayed_queue_size = 4294967295;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = 1;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-'#--------------------FN_DYNVARS_026_04-------------------------#'
-SET @@global.delayed_queue_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '0'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '-1024'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '42949672950'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = 429496729.5;
-ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-4294967295
-SET @@global.delayed_queue_size = ON;
-ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
-SELECT @@delayed_queue_size;
-@@delayed_queue_size
-4294967295
-'#-------------------FN_DYNVARS_026_05----------------------------#'
-SET @@session.delayed_queue_size = 0;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.delayed_queue_size;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable
-'#----------------------FN_DYNVARS_026_06------------------------#'
-SELECT @@global.delayed_queue_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='delayed_queue_size';
-@@global.delayed_queue_size = VARIABLE_VALUE
-1
-SELECT @@delayed_queue_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='delayed_queue_size';
-@@delayed_queue_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_026_07----------------------#'
-SET @@global.delayed_queue_size = TRUE;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-SET @@global.delayed_queue_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect delayed_queue_size value: '0'
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1
-'#---------------------FN_DYNVARS_026_08----------------------#'
-SET @@global.delayed_queue_size = 1;
-SELECT @@delayed_queue_size = @@global.delayed_queue_size;
-@@delayed_queue_size = @@global.delayed_queue_size
-1
-'#---------------------FN_DYNVARS_026_09----------------------#'
-SET delayed_queue_size = 1;
-ERROR HY000: Variable 'delayed_queue_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@delayed_queue_size;
-@@delayed_queue_size
-1
-SET local.delayed_queue_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
-SELECT local.delayed_queue_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.delayed_queue_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1
-SELECT global.delayed_queue_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT delayed_queue_size = @@session.delayed_queue_size;
-ERROR 42S22: Unknown column 'delayed_queue_size' in 'field list'
-SET @@global.delayed_queue_size = @start_value;
-SELECT @@global.delayed_queue_size;
-@@global.delayed_queue_size
-1000

=== renamed file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/join_buffer_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-SET @start_global_value = @@global.join_buffer_size;
-SELECT @start_global_value;
- at start_global_value
-131072
-SET @start_session_value = @@session.join_buffer_size;
-SELECT @start_session_value;
- at start_session_value
-131072
-'#--------------------FN_DYNVARS_053_01-------------------------#'
-SET @@global.join_buffer_size = DEFAULT;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-131072
-SET @@session.join_buffer_size = DEFAULT;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-131072
-'#--------------------FN_DYNVARS_053_03-------------------------#'
-SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-8192
-SET @@global.join_buffer_size = 65536;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-65536
-SET @@global.join_buffer_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-4294967168
-'#--------------------FN_DYNVARS_053_04-------------------------#'
-SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-8192
-SET @@session.join_buffer_size = 65536;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-65536
-SET @@session.join_buffer_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-4294967168
-'#------------------FN_DYNVARS_053_05-----------------------#'
-SET @@global.join_buffer_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = 127;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '127'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-128
-SET @@global.join_buffer_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@global.join_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@global.join_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = 127;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '127'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-128
-SET @@session.join_buffer_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-SET @@session.join_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-42949672832
-'#------------------FN_DYNVARS_053_06-----------------------#'
-SELECT @@global.join_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='join_buffer_size';
-@@global.join_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_053_07-----------------------#'
-SELECT @@session.join_buffer_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='join_buffer_size';
-@@session.join_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_053_08-----------------------#'
-SET @@global.join_buffer_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SET @@global.join_buffer_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '0'
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.join_buffer_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '10'
-SELECT @@join_buffer_size = @@global.join_buffer_size;
-@@join_buffer_size = @@global.join_buffer_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@join_buffer_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '100'
-SELECT @@join_buffer_size = @@local.join_buffer_size;
-@@join_buffer_size = @@local.join_buffer_size
-1
-SELECT @@local.join_buffer_size = @@session.join_buffer_size;
-@@local.join_buffer_size = @@session.join_buffer_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET join_buffer_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size;
-@@join_buffer_size
-128
-SELECT local.join_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.join_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT join_buffer_size = @@session.join_buffer_size;
-ERROR 42S22: Unknown column 'join_buffer_size' in 'field list'
-SET @@global.join_buffer_size = @start_global_value;
-SELECT @@global.join_buffer_size;
-@@global.join_buffer_size
-131072
-SET @@session.join_buffer_size = @start_session_value;
-SELECT @@session.join_buffer_size;
-@@session.join_buffer_size
-131072

=== renamed file 'mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result' => 'mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-SET @start_value = @@global.key_cache_age_threshold;
-SELECT @start_value;
- at start_value
-300
-'#--------------------FN_DYNVARS_056_01------------------------#'
-SET @@global.key_cache_age_threshold = DEFAULT;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-300
-'#---------------------FN_DYNVARS_056_02-------------------------#'
-SET @@global.key_cache_age_threshold = @start_value;
-SELECT @@global.key_cache_age_threshold = 300;
-@@global.key_cache_age_threshold = 300
-1
-'#--------------------FN_DYNVARS_056_03------------------------#'
-SET @@global.key_cache_age_threshold = 100;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '4294967295'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = 1800;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-1800
-SET @@global.key_cache_age_threshold = 65535;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '65535'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-65500
-'#--------------------FN_DYNVARS_056_04-------------------------#'
-SET @@global.key_cache_age_threshold = -1;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '42949672951'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-4294967200
-SET @@global.key_cache_age_threshold = -1024;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1024'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 99;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = ON;
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = 'test';
-ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-'#-------------------FN_DYNVARS_056_05----------------------------#'
-SET @@session.key_cache_age_threshold = 0;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.key_cache_age_threshold;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable
-'#----------------------FN_DYNVARS_056_06------------------------#'
-SELECT @@global.key_cache_age_threshold = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_age_threshold';
-@@global.key_cache_age_threshold = VARIABLE_VALUE
-1
-SELECT @@key_cache_age_threshold = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_age_threshold';
-@@key_cache_age_threshold = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_056_07----------------------#'
-SET @@global.key_cache_age_threshold = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '1'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-SET @@global.key_cache_age_threshold = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '0'
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-100
-'#---------------------FN_DYNVARS_056_08----------------------#'
-SET @@global.key_cache_age_threshold = 101;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '101'
-SELECT @@key_cache_age_threshold = @@global.key_cache_age_threshold;
-@@key_cache_age_threshold = @@global.key_cache_age_threshold
-1
-'#---------------------FN_DYNVARS_056_09----------------------#'
-SET key_cache_age_threshold = 8000;
-ERROR HY000: Variable 'key_cache_age_threshold' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@key_cache_age_threshold;
-@@key_cache_age_threshold
-100
-SET local.key_cache_age_threshold = 10;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
-SELECT local.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.key_cache_age_threshold = 10;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1
-SELECT global.key_cache_age_threshold;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT key_cache_age_threshold = @@session.key_cache_age_threshold;
-ERROR 42S22: Unknown column 'key_cache_age_threshold' in 'field list'
-SET @@global.key_cache_age_threshold = @start_value;
-SELECT @@global.key_cache_age_threshold;
-@@global.key_cache_age_threshold
-300

=== renamed file 'mysql-test/suite/sys_vars/r/log_warnings_basic_32.result' => 'mysql-test/suite/sys_vars/r/log_warnings_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/log_warnings_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-SET @start_global_value = @@global.log_warnings;
-SELECT @start_global_value;
- at start_global_value
-1
-SET @start_session_value = @@session.log_warnings;
-SELECT @start_session_value;
- at start_session_value
-1
-'#--------------------FN_DYNVARS_067_01-------------------------#'
-SET @@global.log_warnings = 100;
-SET @@global.log_warnings = DEFAULT;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@session.log_warnings = 200;
-SET @@session.log_warnings = DEFAULT;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1
-'#--------------------FN_DYNVARS_067_02-------------------------#'
-SET @@global.log_warnings = DEFAULT;
-SELECT @@global.log_warnings = 1;
-@@global.log_warnings = 1
-1
-SET @@session.log_warnings = DEFAULT;
-SELECT @@session.log_warnings = 1;
-@@session.log_warnings = 1
-1
-'#--------------------FN_DYNVARS_067_03-------------------------#'
-SET @@global.log_warnings = 0;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = 1;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@global.log_warnings = 60020;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-60020
-SET @@global.log_warnings = 65535;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-65535
-SET @@global.log_warnings = 65536;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-65536
-'#--------------------FN_DYNVARS_067_04-------------------------#'
-SET @@session.log_warnings = 0;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-SET @@session.log_warnings = 1;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1
-SET @@session.log_warnings = 50050;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-50050
-SET @@session.log_warnings = 65535;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-65535
-SET @@session.log_warnings = 65550;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-65550
-'#------------------FN_DYNVARS_067_05-----------------------#'
-SET @@global.log_warnings = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '100000000000'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-4294967295
-SET @@global.log_warnings = -1024;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '-1024'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@global.log_warnings = test;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-SET @@session.log_warnings = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '100000000000'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-4294967295
-SET @@session.log_warnings = -2;
-Warnings:
-Warning	1292	Truncated incorrect log_warnings value: '-2'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-SET @@session.log_warnings = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SET @@session.log_warnings = test;
-ERROR 42000: Incorrect argument type to variable 'log_warnings'
-SELECT @@session.log_warnings;
-@@session.log_warnings
-0
-'#------------------FN_DYNVARS_067_06-----------------------#'
-SELECT @@global.log_warnings = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='log_warnings';
-@@global.log_warnings = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_067_07-----------------------#'
-SELECT @@session.log_warnings = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='log_warnings';
-@@session.log_warnings = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_067_08-----------------------#'
-SET @@global.log_warnings = TRUE;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@global.log_warnings = FALSE;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-0
-'#---------------------FN_DYNVARS_067_09----------------------#'
-SET @@global.log_warnings = 10;
-SELECT @@log_warnings = @@global.log_warnings;
-@@log_warnings = @@global.log_warnings
-0
-'#---------------------FN_DYNVARS_067_10----------------------#'
-SET @@log_warnings = 100;
-SELECT @@log_warnings = @@local.log_warnings;
-@@log_warnings = @@local.log_warnings
-1
-SELECT @@local.log_warnings = @@session.log_warnings;
-@@local.log_warnings = @@session.log_warnings
-1
-'#---------------------FN_DYNVARS_067_11----------------------#'
-SET log_warnings = 1;
-SELECT @@log_warnings;
-@@log_warnings
-1
-SELECT local.log_warnings;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.log_warnings;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT log_warnings = @@session.log_warnings;
-ERROR 42S22: Unknown column 'log_warnings' in 'field list'
-SET @@global.log_warnings = @start_global_value;
-SELECT @@global.log_warnings;
-@@global.log_warnings
-1
-SET @@session.log_warnings = @start_session_value;
-SELECT @@session.log_warnings;
-@@session.log_warnings
-1

=== renamed file 'mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result' => 'mysql-test/suite/sys_vars/r/max_connect_errors_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-SET @start_value = @@global.max_connect_errors;
-SELECT @start_value;
- at start_value
-10
-'#--------------------FN_DYNVARS_073_01------------------------#'
-SET @@global.max_connect_errors = 5000;
-SET @@global.max_connect_errors = DEFAULT;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-10
-'#---------------------FN_DYNVARS_073_02-------------------------#'
-SET @@global.max_connect_errors = @start_value;
-SELECT @@global.max_connect_errors = 10;
-@@global.max_connect_errors = 10
-1
-'#--------------------FN_DYNVARS_073_03------------------------#'
-SET @@global.max_connect_errors = 4096;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4096
-SET @@global.max_connect_errors = 4294967294;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967294
-SET @@global.max_connect_errors = 4294967295;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 1;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 2;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-2
-'#--------------------FN_DYNVARS_073_04-------------------------#'
-SET @@global.max_connect_errors = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '-1'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 100000000000;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '100000000000'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '-1024'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '0'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '4294967296'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = ON;
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-SET @@global.max_connect_errors = 'test';
-ERROR 42000: Incorrect argument type to variable 'max_connect_errors'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-4294967295
-'#-------------------FN_DYNVARS_073_05----------------------------#'
-SET @@session.max_connect_errors = 4096;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.max_connect_errors;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable
-'#----------------------FN_DYNVARS_073_06------------------------#'
-SELECT @@global.max_connect_errors = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_connect_errors';
-@@global.max_connect_errors = VARIABLE_VALUE
-1
-SELECT @@max_connect_errors = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_connect_errors';
-@@max_connect_errors = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_073_07----------------------#'
-SET @@global.max_connect_errors = TRUE;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-SET @@global.max_connect_errors = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_connect_errors value: '0'
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-1
-'#---------------------FN_DYNVARS_073_08----------------------#'
-SET @@global.max_connect_errors = 5000;
-SELECT @@max_connect_errors = @@global.max_connect_errors;
-@@max_connect_errors = @@global.max_connect_errors
-1
-'#---------------------FN_DYNVARS_073_09----------------------#'
-SET max_connect_errors = 6000;
-ERROR HY000: Variable 'max_connect_errors' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@max_connect_errors;
-@@max_connect_errors
-5000
-SET local.max_connect_errors = 7000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 7000' at line 1
-SELECT local.max_connect_errors;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.max_connect_errors = 8000;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 8000' at line 1
-SELECT global.max_connect_errors;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT max_connect_errors = @@session.max_connect_errors;
-ERROR 42S22: Unknown column 'max_connect_errors' in 'field list'
-SET @@global.max_connect_errors = @start_value;
-SELECT @@global.max_connect_errors;
-@@global.max_connect_errors
-10

=== renamed file 'mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result' => 'mysql-test/suite/sys_vars/r/max_seeks_for_key_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-SET @start_global_value = @@global.max_seeks_for_key;
-SELECT @start_global_value;
- at start_global_value
-4294967295
-SET @start_session_value = @@session.max_seeks_for_key;
-SELECT @start_session_value;
- at start_session_value
-4294967295
-'#--------------------FN_DYNVARS_083_01-------------------------#'
-SET @@global.max_seeks_for_key = 100;
-SET @@global.max_seeks_for_key = DEFAULT;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 200;
-SET @@session.max_seeks_for_key = DEFAULT;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-'#--------------------FN_DYNVARS_083_02-------------------------#'
-SET @@global.max_seeks_for_key = DEFAULT;
-SELECT @@global.max_seeks_for_key = 4294967295;
-@@global.max_seeks_for_key = 4294967295
-1
-SET @@session.max_seeks_for_key = DEFAULT;
-SELECT @@session.max_seeks_for_key = 4294967295;
-@@session.max_seeks_for_key = 4294967295
-1
-'#--------------------FN_DYNVARS_083_03-------------------------#'
-SET @@global.max_seeks_for_key = 1;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = 2;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-2
-SET @@global.max_seeks_for_key = 65536;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-65536
-SET @@global.max_seeks_for_key = 4294967295;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = 4294967294;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967294
-'#--------------------FN_DYNVARS_083_04-------------------------#'
-SET @@session.max_seeks_for_key = 1;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = 2;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-2
-SET @@session.max_seeks_for_key = 4294967295;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 4294967294;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967294
-SET @@session.max_seeks_for_key = 65535;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-65535
-'#------------------FN_DYNVARS_083_05-----------------------#'
-SET @@global.max_seeks_for_key = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '-1024'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '4294967296'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@global.max_seeks_for_key = test;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = 0;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = -2;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '-2'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-1
-SET @@session.max_seeks_for_key = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SET @@session.max_seeks_for_key = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '4294967296'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = test;
-ERROR 42000: Incorrect argument type to variable 'max_seeks_for_key'
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295
-'#------------------FN_DYNVARS_083_06-----------------------#'
-SELECT @@global.max_seeks_for_key = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_seeks_for_key';
-@@global.max_seeks_for_key = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_083_07-----------------------#'
-SELECT @@session.max_seeks_for_key = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_seeks_for_key';
-@@session.max_seeks_for_key = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_083_08-----------------------#'
-SET @@global.max_seeks_for_key = TRUE;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-SET @@global.max_seeks_for_key = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_seeks_for_key value: '0'
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-1
-'#---------------------FN_DYNVARS_083_09----------------------#'
-SET @@global.max_seeks_for_key = 10;
-SELECT @@max_seeks_for_key = @@global.max_seeks_for_key;
-@@max_seeks_for_key = @@global.max_seeks_for_key
-0
-'#---------------------FN_DYNVARS_083_10----------------------#'
-SET @@max_seeks_for_key = 100;
-SELECT @@max_seeks_for_key = @@local.max_seeks_for_key;
-@@max_seeks_for_key = @@local.max_seeks_for_key
-1
-SELECT @@local.max_seeks_for_key = @@session.max_seeks_for_key;
-@@local.max_seeks_for_key = @@session.max_seeks_for_key
-1
-'#---------------------FN_DYNVARS_083_11----------------------#'
-SET max_seeks_for_key = 1;
-SELECT @@max_seeks_for_key;
-@@max_seeks_for_key
-1
-SELECT local.max_seeks_for_key;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.max_seeks_for_key;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT max_seeks_for_key = @@session.max_seeks_for_key;
-ERROR 42S22: Unknown column 'max_seeks_for_key' in 'field list'
-SET @@global.max_seeks_for_key = @start_global_value;
-SELECT @@global.max_seeks_for_key;
-@@global.max_seeks_for_key
-4294967295
-SET @@session.max_seeks_for_key = @start_session_value;
-SELECT @@session.max_seeks_for_key;
-@@session.max_seeks_for_key
-4294967295

=== renamed file 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result' => 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,197 +0,0 @@
-SET @start_global_value = @@global.max_tmp_tables;
-SELECT @start_global_value;
- at start_global_value
-32
-SET @start_session_value = @@session.max_tmp_tables;
-SELECT @start_session_value;
- at start_session_value
-32
-'#--------------------FN_DYNVARS_086_01-------------------------#'
-SET @@global.max_tmp_tables = 1000;
-SET @@global.max_tmp_tables = DEFAULT;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-32
-SET @@session.max_tmp_tables = 1000;
-SET @@session.max_tmp_tables = DEFAULT;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-32
-'#--------------------FN_DYNVARS_086_02-------------------------#'
-SET @@global.max_tmp_tables = DEFAULT;
-SELECT @@global.max_tmp_tables = 32;
-@@global.max_tmp_tables = 32
-1
-SET @@session.max_tmp_tables = DEFAULT;
-SELECT @@session.max_tmp_tables = 32;
-@@session.max_tmp_tables = 32
-1
-'#--------------------FN_DYNVARS_086_03-------------------------#'
-SET @@global.max_tmp_tables = 1;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 2;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-2
-SET @@global.max_tmp_tables = 65536;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-65536
-SET @@global.max_tmp_tables = 4294967295;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = 4294967294;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967294
-'#--------------------FN_DYNVARS_086_04-------------------------#'
-SET @@session.max_tmp_tables = 1;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 2;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-2
-SET @@session.max_tmp_tables = 65536;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-65536
-SET @@session.max_tmp_tables = 4294967295;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = 4294967294;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967294
-'#------------------FN_DYNVARS_086_05-----------------------#'
-SET @@global.max_tmp_tables = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1024'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@global.max_tmp_tables = test;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = -001;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-1
-SET @@session.max_tmp_tables = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SET @@session.max_tmp_tables = 10737418241;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '10737418241'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-SET @@session.max_tmp_tables = test;
-ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-4294967295
-'#------------------FN_DYNVARS_086_06-----------------------#'
-SELECT @@global.max_tmp_tables = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_tmp_tables';
-@@global.max_tmp_tables = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_086_07-----------------------#'
-SELECT @@session.max_tmp_tables = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_tmp_tables';
-@@session.max_tmp_tables = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_086_08-----------------------#'
-SET @@global.max_tmp_tables = TRUE;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-SET @@global.max_tmp_tables = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_tmp_tables value: '0'
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-1
-'#---------------------FN_DYNVARS_086_09----------------------#'
-SET @@global.max_tmp_tables = 20;
-SELECT @@max_tmp_tables = @@global.max_tmp_tables;
-@@max_tmp_tables = @@global.max_tmp_tables
-0
-'#---------------------FN_DYNVARS_086_10----------------------#'
-SET @@max_tmp_tables = 255;
-SELECT @@max_tmp_tables = @@local.max_tmp_tables;
-@@max_tmp_tables = @@local.max_tmp_tables
-1
-SELECT @@local.max_tmp_tables = @@session.max_tmp_tables;
-@@local.max_tmp_tables = @@session.max_tmp_tables
-1
-'#---------------------FN_DYNVARS_086_11----------------------#'
-SET max_tmp_tables = 102;
-SELECT @@max_tmp_tables;
-@@max_tmp_tables
-102
-SELECT local.max_tmp_tables;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.max_tmp_tables;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT max_tmp_tables = @@session.max_tmp_tables;
-ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
-SET @@global.max_tmp_tables = @start_global_value;
-SELECT @@global.max_tmp_tables;
-@@global.max_tmp_tables
-32
-SET @@session.max_tmp_tables = @start_session_value;
-SELECT @@session.max_tmp_tables;
-@@session.max_tmp_tables
-32

=== renamed file 'mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result' => 'mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-SET @start_global_value = @@global.max_write_lock_count;
-SELECT @start_global_value;
- at start_global_value
-4294967295
-'#--------------------FN_DYNVARS_088_01-------------------------#'
-SET @@global.max_write_lock_count = 1000;
-SET @@global.max_write_lock_count = DEFAULT;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-'#--------------------FN_DYNVARS_088_02-------------------------#'
-SET @@global.max_write_lock_count = DEFAULT;
-SELECT @@global.max_write_lock_count = 4294967295;
-@@global.max_write_lock_count = 4294967295
-1
-'#--------------------FN_DYNVARS_088_03-------------------------#'
-SET @@global.max_write_lock_count = 1;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 2;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-2
-SET @@global.max_write_lock_count = 65536;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-65536
-SET @@global.max_write_lock_count = 4294967295;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = 4294967294;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967294
-'#------------------FN_DYNVARS_088_04-----------------------#'
-SET @@global.max_write_lock_count = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '-1024'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '4294967296'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '-1'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '429496729500'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_write_lock_count'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-SET @@global.max_write_lock_count = test;
-ERROR 42000: Incorrect argument type to variable 'max_write_lock_count'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295
-'#------------------FN_DYNVARS_088_05-----------------------#'
-SELECT @@global.max_write_lock_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_write_lock_count';
-@@global.max_write_lock_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_088_06-----------------------#'
-SET @@global.max_write_lock_count = TRUE;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-SET @@global.max_write_lock_count = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect max_write_lock_count value: '0'
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-1
-'#---------------------FN_DYNVARS_088_07----------------------#'
-SET @@global.max_write_lock_count = 20;
-SELECT @@max_write_lock_count = @@global.max_write_lock_count;
-@@max_write_lock_count = @@global.max_write_lock_count
-1
-'#---------------------FN_DYNVARS_088_08----------------------#'
-SET @@global.max_write_lock_count = 102;
-SELECT @@max_write_lock_count;
-@@max_write_lock_count
-102
-SELECT local.max_write_lock_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT global.max_write_lock_count;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT max_write_lock_count = @@global.max_write_lock_count;
-ERROR 42S22: Unknown column 'max_write_lock_count' in 'field list'
-SET @@global.max_write_lock_count = @start_global_value;
-SELECT @@global.max_write_lock_count;
-@@global.max_write_lock_count
-4294967295

=== renamed file 'mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result' => 'mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-SET @start_global_value = @@global.min_examined_row_limit;
-SELECT @start_global_value;
- at start_global_value
-0
-SET @start_session_value = @@session.min_examined_row_limit;
-SELECT @start_session_value;
- at start_session_value
-0
-'#--------------------FN_DYNVARS_089_01-------------------------#'
-SET @@global.min_examined_row_limit = 100;
-SET @@global.min_examined_row_limit = DEFAULT;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 200;
-SET @@session.min_examined_row_limit = DEFAULT;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-'#--------------------FN_DYNVARS_089_02-------------------------#'
-SET @@global.min_examined_row_limit = DEFAULT;
-SELECT @@global.min_examined_row_limit = 0;
-@@global.min_examined_row_limit = 0
-1
-SET @@session.min_examined_row_limit = DEFAULT;
-SELECT @@session.min_examined_row_limit = 0;
-@@session.min_examined_row_limit = 0
-1
-'#--------------------FN_DYNVARS_089_03-------------------------#'
-SET @@global.min_examined_row_limit = 0;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@global.min_examined_row_limit = 1;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-1
-SET @@global.min_examined_row_limit = 60020;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-60020
-SET @@global.min_examined_row_limit = 65535;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-65535
-SET @@global.min_examined_row_limit = 4294967295;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = 4294967294;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967294
-'#--------------------FN_DYNVARS_089_04-------------------------#'
-SET @@session.min_examined_row_limit = 0;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 1;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-1
-SET @@session.min_examined_row_limit = 50050;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-50050
-SET @@session.min_examined_row_limit = 65535;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-65535
-SET @@session.min_examined_row_limit = 4294967295;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = 4294967294;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967294
-'#------------------FN_DYNVARS_089_05-----------------------#'
-SET @@global.min_examined_row_limit = 429496726;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-429496726
-SET @@global.min_examined_row_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '-1024'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@global.min_examined_row_limit = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '429496729500'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@global.min_examined_row_limit = test;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '4294967296'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = -1;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '-1'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SET @@session.min_examined_row_limit = 4294967295021;
-Warnings:
-Warning	1292	Truncated incorrect min_examined_row_limit value: '4294967295021'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-SET @@session.min_examined_row_limit = test;
-ERROR 42000: Incorrect argument type to variable 'min_examined_row_limit'
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-4294967295
-'#------------------FN_DYNVARS_089_06-----------------------#'
-SELECT @@global.min_examined_row_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='min_examined_row_limit';
-@@global.min_examined_row_limit = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_089_07-----------------------#'
-SELECT @@session.min_examined_row_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='min_examined_row_limit';
-@@session.min_examined_row_limit = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_089_08-----------------------#'
-SET @@global.min_examined_row_limit = TRUE;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-1
-SET @@global.min_examined_row_limit = FALSE;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-'#---------------------FN_DYNVARS_089_09----------------------#'
-SET @@global.min_examined_row_limit = 10;
-SELECT @@min_examined_row_limit = @@global.min_examined_row_limit;
-@@min_examined_row_limit = @@global.min_examined_row_limit
-0
-'#---------------------FN_DYNVARS_089_10----------------------#'
-SET @@min_examined_row_limit = 100;
-SELECT @@min_examined_row_limit = @@local.min_examined_row_limit;
-@@min_examined_row_limit = @@local.min_examined_row_limit
-1
-SELECT @@local.min_examined_row_limit = @@session.min_examined_row_limit;
-@@local.min_examined_row_limit = @@session.min_examined_row_limit
-1
-'#---------------------FN_DYNVARS_089_11----------------------#'
-SET min_examined_row_limit = 1;
-SELECT @@min_examined_row_limit;
-@@min_examined_row_limit
-1
-SELECT local.min_examined_row_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.min_examined_row_limit;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT min_examined_row_limit = @@session.min_examined_row_limit;
-ERROR 42S22: Unknown column 'min_examined_row_limit' in 'field list'
-SET @@global.min_examined_row_limit = @start_global_value;
-SELECT @@global.min_examined_row_limit;
-@@global.min_examined_row_limit
-0
-SET @@session.min_examined_row_limit = @start_session_value;
-SELECT @@session.min_examined_row_limit;
-@@session.min_examined_row_limit
-0

=== renamed file 'mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result' => 'mysql-test/suite/sys_vars/r/multi_range_count_basic.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result	2012-01-09 13:02:02 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic.result	2012-04-19 13:00:44 +0000
@@ -109,9 +109,6 @@ SELECT @@global.multi_range_count;
 @@global.multi_range_count
 1
 SET @@global.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967296'
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
 4294967295
@@ -123,9 +120,6 @@ SELECT @@global.multi_range_count;
 @@global.multi_range_count
 1
 SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '429496729500'
 SELECT @@global.multi_range_count;
 @@global.multi_range_count
 4294967295
@@ -147,9 +141,6 @@ SELECT @@session.multi_range_count;
 @@session.multi_range_count
 1
 SET @@session.multi_range_count = 4294967296;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967296'
 SELECT @@session.multi_range_count;
 @@session.multi_range_count
 4294967295
@@ -163,9 +154,6 @@ SELECT @@session.multi_range_count;
 SET @@session.multi_range_count = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1
 SET @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '4294967295021'
 SELECT @@session.multi_range_count;
 @@session.multi_range_count
 4294967295

=== 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	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
-SET @start_global_value = @@global.multi_range_count;
-SELECT @start_global_value;
- at start_global_value
-256
-SET @start_session_value = @@session.multi_range_count;
-SELECT @start_session_value;
- at start_session_value
-256
-'#--------------------FN_DYNVARS_090_01-------------------------#'
-SET @@global.multi_range_count = 100;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SET @@global.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = 200;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SET @@session.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256
-'#--------------------FN_DYNVARS_090_02-------------------------#'
-SET @@global.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count = 256;
-@@global.multi_range_count = 256
-1
-SET @@session.multi_range_count = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count = 256;
-@@session.multi_range_count = 256
-1
-'#--------------------FN_DYNVARS_090_03-------------------------#'
-SET @@global.multi_range_count = 1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 60020;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-60020
-SET @@global.multi_range_count = 65535;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-65535
-SET @@global.multi_range_count = 4294967295;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967295
-SET @@global.multi_range_count = 4294967294;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967294
-'#--------------------FN_DYNVARS_090_04-------------------------#'
-SET @@session.multi_range_count = 1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-1
-SET @@session.multi_range_count = 50050;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-50050
-SET @@session.multi_range_count = 65535;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-65535
-SET @@session.multi_range_count = 4294967295;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967295
-SET @@session.multi_range_count = 4294967294;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967294
-'#------------------FN_DYNVARS_090_05-----------------------#'
-SET @@global.multi_range_count = 0;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-4294967296
-SET @@global.multi_range_count = -1024;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '-1024'
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = 429496729500;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-4294967296
-SET @@session.multi_range_count = -1;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-Warning	1292	Truncated incorrect multi_range_count value: '-1'
-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 MariaDB server version for the right syntax to use near '.' at line 1
-SET @@session.multi_range_count = 4294967295021;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-1
-SET @@global.multi_range_count = FALSE;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-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;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@global.multi_range_count;
-@@global.multi_range_count
-256
-SET @@session.multi_range_count = @start_session_value;
-Warnings:
-Warning	1287	The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead
-SELECT @@session.multi_range_count;
-@@session.multi_range_count
-256

=== renamed file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-SET @start_global_value = @@global.myisam_max_sort_file_size;
-SELECT @start_global_value;
- at start_global_value
-9223372036853727232
-'#--------------------FN_DYNVARS_094_01-------------------------#'
-SET @@global.myisam_max_sort_file_size = 500000;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '500000'
-SET @@global.myisam_max_sort_file_size = DEFAULT;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-9223372036853727232
-'#--------------------FN_DYNVARS_094_02-------------------------#'
-SET @@global.myisam_max_sort_file_size = DEFAULT;
-SELECT @@global.myisam_max_sort_file_size = 2147483648;
-@@global.myisam_max_sort_file_size = 2147483648
-0
-'#--------------------FN_DYNVARS_094_03-------------------------#'
-SET @@global.myisam_max_sort_file_size = 0;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '1024'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 123456789;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '123456789'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-122683392
-SET @@global.myisam_max_sort_file_size = 2147483648*2;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-4294967296
-SET @@global.myisam_max_sort_file_size = 2147483648*1024;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-2199023255552
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-2199023255552
-SET @@global.myisam_max_sort_file_size = 2147483648*2147483648;
-'#--------------------FN_DYNVARS_094_04-------------------------#'
-SET @@myisam_max_sort_file_size = 2;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@session.myisam_max_sort_file_size = 3;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@local.myisam_max_sort_file_size = 4;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-'#------------------FN_DYNVARS_094_05-----------------------#'
-SET @@global.myisam_max_sort_file_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-1'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = -2147483648;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-2147483648'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = -2147483649;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '-2147483649'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 2147483649.56;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = 1G;
-ERROR 42000: Incorrect argument type to variable 'myisam_max_sort_file_size'
-'#------------------FN_DYNVARS_094_06-----------------------#'
-SET @@global.myisam_max_sort_file_size = 3000;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '3000'
-SELECT @@global.myisam_max_sort_file_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_max_sort_file_size';
-@@global.myisam_max_sort_file_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_094_07-----------------------#'
-SELECT count(VARIABLE_VALUE) 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_max_sort_file_size';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_094_08-----------------------#'
-SET @@global.myisam_max_sort_file_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '1'
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-SET @@global.myisam_max_sort_file_size = FALSE;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_max_sort_file_size = 512;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '512'
-SELECT @@myisam_max_sort_file_size = @@global.myisam_max_sort_file_size;
-@@myisam_max_sort_file_size = @@global.myisam_max_sort_file_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET myisam_max_sort_file_size = 2048;
-ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT myisam_max_sort_file_size;
-ERROR 42S22: Unknown column 'myisam_max_sort_file_size' in 'field list'
-SELECT @@myisam_max_sort_file_size;
-@@myisam_max_sort_file_size
-0
-SET global myisam_max_sort_file_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '64'
-SET @@global.myisam_max_sort_file_size = @start_global_value;
-SELECT @@global.myisam_max_sort_file_size;
-@@global.myisam_max_sort_file_size
-9223372036853727232

=== renamed file 'mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result' => 'mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result'
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic.result	2012-04-19 13:00:44 +0000
@@ -66,8 +66,6 @@ SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
 1
 SET @@global.myisam_repair_threads  = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '429496729533'
 SELECT @@global.myisam_repair_threads ;
 @@global.myisam_repair_threads
 4294967295

=== removed file 'mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,178 +0,0 @@
-SET @start_global_value = @@global.myisam_repair_threads;
-SELECT @start_global_value;
- at start_global_value
-1
-SET @start_session_value = @@session.myisam_repair_threads;
-SELECT @start_session_value;
- at start_session_value
-1
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_repair_threads  = 100;
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 200;
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_repair_threads  = DEFAULT;
-SELECT @@global.myisam_repair_threads  = 1;
-@@global.myisam_repair_threads  = 1
-1
-SET @@session.myisam_repair_threads  = DEFAULT;
-SELECT @@session.myisam_repair_threads  = 1;
-@@session.myisam_repair_threads  = 1
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_repair_threads  = 1;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 4294967295;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-4294967295
-SET @@global.myisam_repair_threads  = 655354;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_repair_threads  = 1;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 4294967295;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-4294967295
-SET @@session.myisam_repair_threads  = 655345;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-1024'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = 429496729533;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@global.myisam_repair_threads  = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-429496729533
-SET @@session.myisam_repair_threads  = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '-2'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_repair_threads'
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@global.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_repair_threads  = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_repair_threads ';
-@@session.myisam_repair_threads  = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_repair_threads  = TRUE;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@global.myisam_repair_threads  = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_repair_threads value: '0'
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_repair_threads  = 10;
-SELECT @@myisam_repair_threads  = @@global.myisam_repair_threads ;
-@@myisam_repair_threads  = @@global.myisam_repair_threads
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_repair_threads  = 100;
-SELECT @@myisam_repair_threads  = @@local.myisam_repair_threads ;
-@@myisam_repair_threads  = @@local.myisam_repair_threads
-1
-SELECT @@local.myisam_repair_threads  = @@session.myisam_repair_threads ;
-@@local.myisam_repair_threads  = @@session.myisam_repair_threads
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_repair_threads  = 1;
-SELECT @@myisam_repair_threads ;
-@@myisam_repair_threads
-1
-SELECT local.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_repair_threads ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_repair_threads  = @@session.myisam_repair_threads ;
-ERROR 42S22: Unknown column 'myisam_repair_threads' in 'field list'
-SET @@global.myisam_repair_threads  = @start_global_value;
-SELECT @@global.myisam_repair_threads ;
-@@global.myisam_repair_threads
-1
-SET @@session.myisam_repair_threads  = @start_session_value;
-SELECT @@session.myisam_repair_threads ;
-@@session.myisam_repair_threads
-1

=== renamed file 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result' => 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result	2010-04-02 15:17:43 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result	2012-04-19 13:00:44 +0000
@@ -76,32 +76,32 @@ SELECT @@global.myisam_sort_buffer_size
 SET @@global.myisam_sort_buffer_size   = 429496729533;
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = test;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = "test";
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = 'test';
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@global.myisam_sort_buffer_size   = ON;
 ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
 SELECT @@global.myisam_sort_buffer_size  ;
 @@global.myisam_sort_buffer_size
-429496729533
+4294967295
 SET @@session.myisam_sort_buffer_size   = 0;
 Warnings:
 Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'

=== removed file 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result	2010-04-02 15:17:43 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-SET @start_global_value = @@global.myisam_sort_buffer_size ;
-SELECT @start_global_value;
- at start_global_value
-8388608
-SET @start_session_value = @@session.myisam_sort_buffer_size ;
-SELECT @start_session_value;
- at start_session_value
-8388608
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.myisam_sort_buffer_size   = 100;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '100'
-SET @@global.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-8388608
-SET @@session.myisam_sort_buffer_size   = 200;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '200'
-SET @@session.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-8388608
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@global.myisam_sort_buffer_size   = 8388608;
-@@global.myisam_sort_buffer_size   = 8388608
-1
-SET @@session.myisam_sort_buffer_size   = DEFAULT;
-SELECT @@session.myisam_sort_buffer_size   = 8388608;
-@@session.myisam_sort_buffer_size   = 8388608
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.myisam_sort_buffer_size   = 4;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '4'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = 4294967295;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 655354;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-655354
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.myisam_sort_buffer_size   = 4;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '4'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = 4294967295;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4294967295
-SET @@session.myisam_sort_buffer_size   = 655345;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-655345
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.myisam_sort_buffer_size   = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = -1024;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '-1024'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = 429496729533;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '429496729533'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = 'test';
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@global.myisam_sort_buffer_size   = ON;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4294967295
-SET @@session.myisam_sort_buffer_size   = 0;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = -2;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '-2'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = test;
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-SET @@session.myisam_sort_buffer_size   = "test";
-ERROR 42000: Incorrect argument type to variable 'myisam_sort_buffer_size'
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-4096
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.myisam_sort_buffer_size   = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='myisam_sort_buffer_size  ';
-@@global.myisam_sort_buffer_size   = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.myisam_sort_buffer_size   = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='myisam_sort_buffer_size  ';
-@@session.myisam_sort_buffer_size   = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_08-----------------------#'
-SET @@global.myisam_sort_buffer_size   = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '1'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-SET @@global.myisam_sort_buffer_size   = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '0'
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-4096
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.myisam_sort_buffer_size   = 10;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '10'
-SELECT @@myisam_sort_buffer_size   = @@global.myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size   = @@global.myisam_sort_buffer_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@myisam_sort_buffer_size   = 100;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '100'
-SELECT @@myisam_sort_buffer_size   = @@local.myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size   = @@local.myisam_sort_buffer_size
-1
-SELECT @@local.myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size  ;
-@@local.myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET myisam_sort_buffer_size   = 1;
-Warnings:
-Warning	1292	Truncated incorrect myisam_sort_buffer_size value: '1'
-SELECT @@myisam_sort_buffer_size  ;
-@@myisam_sort_buffer_size
-4096
-SELECT local.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.myisam_sort_buffer_size  ;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT myisam_sort_buffer_size   = @@session.myisam_sort_buffer_size  ;
-ERROR 42S22: Unknown column 'myisam_sort_buffer_size' in 'field list'
-SET @@global.myisam_sort_buffer_size   = @start_global_value;
-SELECT @@global.myisam_sort_buffer_size  ;
-@@global.myisam_sort_buffer_size
-8388608
-SET @@session.myisam_sort_buffer_size   = @start_session_value;
-SELECT @@session.myisam_sort_buffer_size  ;
-@@session.myisam_sort_buffer_size
-8388608

=== renamed file 'mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result' => 'mysql-test/suite/sys_vars/r/net_retry_count_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-SET @start_global_value = @@global.net_retry_count;
-SELECT @start_global_value;
- at start_global_value
-10
-SET @start_session_value = @@session.net_retry_count;
-SELECT @start_session_value;
- at start_session_value
-10
-'#--------------------FN_DYNVARS_111_01-------------------------#'
-SET @@global.net_retry_count = 100;
-SET @@global.net_retry_count = DEFAULT;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-10
-SET @@session.net_retry_count = 200;
-SET @@session.net_retry_count = DEFAULT;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-10
-'#--------------------FN_DYNVARS_111_02-------------------------#'
-SET @@global.net_retry_count = DEFAULT;
-SELECT @@global.net_retry_count = 10;
-@@global.net_retry_count = 10
-1
-SET @@session.net_retry_count = DEFAULT;
-SELECT @@session.net_retry_count = 10;
-@@session.net_retry_count = 10
-1
-'#--------------------FN_DYNVARS_111_03-------------------------#'
-SET @@global.net_retry_count = 1;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = 2;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-2
-SET @@global.net_retry_count = 4294967295;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 4294967294;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967294
-SET @@global.net_retry_count = 65536;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-65536
-'#--------------------FN_DYNVARS_111_04-------------------------#'
-SET @@session.net_retry_count = 1;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = 2;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-2
-SET @@session.net_retry_count = 65535;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-65535
-SET @@session.net_retry_count = 4294967295;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = 4294967294;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967294
-'#------------------FN_DYNVARS_111_05-----------------------#'
-SET @@global.net_retry_count = 0;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = -1024;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '-1024'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '4294967296'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 429496729500;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '429496729500'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@global.net_retry_count = test;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-4294967295
-SET @@session.net_retry_count = 0;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = -2;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '-2'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-1
-SET @@session.net_retry_count = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SET @@session.net_retry_count = 6555015425;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '6555015425'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '4294967296'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-SET @@session.net_retry_count = test;
-ERROR 42000: Incorrect argument type to variable 'net_retry_count'
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-4294967295
-'#------------------FN_DYNVARS_111_06-----------------------#'
-SELECT @@global.net_retry_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='net_retry_count';
-@@global.net_retry_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_111_07-----------------------#'
-SELECT @@session.net_retry_count = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='net_retry_count';
-@@session.net_retry_count = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_111_08-----------------------#'
-SET @@global.net_retry_count = TRUE;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-SET @@global.net_retry_count = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect net_retry_count value: '0'
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-1
-'#---------------------FN_DYNVARS_111_09----------------------#'
-SET @@global.net_retry_count = 10;
-SELECT @@net_retry_count = @@global.net_retry_count;
-@@net_retry_count = @@global.net_retry_count
-0
-'#---------------------FN_DYNVARS_111_10----------------------#'
-SET @@net_retry_count = 100;
-SELECT @@net_retry_count = @@local.net_retry_count;
-@@net_retry_count = @@local.net_retry_count
-1
-SELECT @@local.net_retry_count = @@session.net_retry_count;
-@@local.net_retry_count = @@session.net_retry_count
-1
-'#---------------------FN_DYNVARS_111_11----------------------#'
-SET net_retry_count = 1;
-SELECT @@net_retry_count;
-@@net_retry_count
-1
-SELECT local.net_retry_count;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.net_retry_count;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT net_retry_count = @@session.net_retry_count;
-ERROR 42S22: Unknown column 'net_retry_count' in 'field list'
-SET @@global.net_retry_count = @start_global_value;
-SELECT @@global.net_retry_count;
-@@global.net_retry_count
-10
-SET @@session.net_retry_count = @start_session_value;
-SELECT @@session.net_retry_count;
-@@session.net_retry_count
-10

=== renamed file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result	2011-10-21 23:07:39 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-SET @start_global_value = @@global.query_alloc_block_size;
-SELECT @start_global_value;
- at start_global_value
-8192
-SET @start_session_value = @@session.query_alloc_block_size;
-SELECT @start_session_value;
- at start_session_value
-8192
-'#--------------------FN_DYNVARS_130_01-------------------------#'
-SET @@global.query_alloc_block_size = 10000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '10000'
-SET @@global.query_alloc_block_size = DEFAULT;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-8192
-SET @@session.query_alloc_block_size = 20000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '20000'
-SET @@session.query_alloc_block_size = DEFAULT;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_130_02-------------------------#'
-SET @@global.query_alloc_block_size = DEFAULT;
-SELECT @@global.query_alloc_block_size = 8192;
-@@global.query_alloc_block_size = 8192
-1
-SET @@session.query_alloc_block_size = DEFAULT;
-SELECT @@session.query_alloc_block_size = 8192;
-@@session.query_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_130_03-------------------------#'
-SET @@global.query_alloc_block_size = 1024;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 1025;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1025'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 65536;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-65536
-'#--------------------FN_DYNVARS_130_04-------------------------#'
-SET @@session.query_alloc_block_size = 1024;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 1025;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1025'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 655536;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '655536'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-655360
-'#------------------FN_DYNVARS_130_05-----------------------#'
-SET @@global.query_alloc_block_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '64'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '-1'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 1023;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1023'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 64;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '64'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '-2'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SET @@session.query_alloc_block_size = 1023;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1023'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-SET @@session.query_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-1024
-'#------------------FN_DYNVARS_130_06-----------------------#'
-SET @@global.query_alloc_block_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1'
-SET @@session.query_alloc_block_size = 12;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '12'
-SELECT @@global.query_alloc_block_size = 
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_alloc_block_size';
-@@global.query_alloc_block_size = 
-VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_130_07-----------------------#'
-SELECT @@session.query_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_alloc_block_size';
-@@session.query_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_130_08-----------------------#'
-SET @@global.query_alloc_block_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '1'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-SET @@global.query_alloc_block_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '0'
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-1024
-'#---------------------FN_DYNVARS_130_09----------------------#'
-SET @@global.query_alloc_block_size = 2048;
-SELECT @@query_alloc_block_size = @@global.query_alloc_block_size;
-@@query_alloc_block_size = @@global.query_alloc_block_size
-0
-'#---------------------FN_DYNVARS_130_10----------------------#'
-SET @@query_alloc_block_size = 5000;
-Warnings:
-Warning	1292	Truncated incorrect query_alloc_block_size value: '5000'
-SELECT @@query_alloc_block_size = @@local.query_alloc_block_size;
-@@query_alloc_block_size = @@local.query_alloc_block_size
-1
-SELECT @@local.query_alloc_block_size = @@session.query_alloc_block_size;
-@@local.query_alloc_block_size = @@session.query_alloc_block_size
-1
-'#---------------------FN_DYNVARS_130_11----------------------#'
-SET query_alloc_block_size = 1024;
-SELECT @@query_alloc_block_size;
-@@query_alloc_block_size
-1024
-SELECT local.query_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.query_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT query_alloc_block_size = @@session.query_alloc_block_size;
-ERROR 42S22: Unknown column 'query_alloc_block_size' in 'field list'
-SET @@global.query_alloc_block_size = @start_global_value;
-SELECT @@global.query_alloc_block_size;
-@@global.query_alloc_block_size
-8192
-SET @@session.query_alloc_block_size = @start_session_value;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-8192

=== renamed file 'mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result' => 'mysql-test/suite/sys_vars/r/query_cache_limit_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-SET @start_value = @@global.query_cache_limit;
-SELECT @start_value;
- at start_value
-1048576
-'#--------------------FN_DYNVARS_131_01------------------------#'
-SET @@global.query_cache_limit = 99;
-SET @@global.query_cache_limit = DEFAULT;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576
-'#---------------------FN_DYNVARS_131_02-------------------------#'
-SET @@global.query_cache_limit = @start_value;
-SELECT @@global.query_cache_limit = 1048576;
-@@global.query_cache_limit = 1048576
-1
-'#--------------------FN_DYNVARS_131_03------------------------#'
-SET @@global.query_cache_limit = 0;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 1;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1
-SET @@global.query_cache_limit = 1048576;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576
-SET @@global.query_cache_limit = 1048575;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048575
-'#--------------------FN_DYNVARS_131_04-------------------------#'
-SET @@global.query_cache_limit = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '-1'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '4294967296'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 10240022115;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '10240022115'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '-1024'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-SET @@global.query_cache_limit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_limit value: '42949672950'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-SET @@global.query_cache_limit = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_limit'
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-4294967295
-'#-------------------FN_DYNVARS_131_05----------------------------#'
-SET @@session.query_cache_limit = 0;
-ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_limit;
-@@query_cache_limit
-4294967295
-'#----------------------FN_DYNVARS_131_06------------------------#'
-SELECT @@global.query_cache_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_limit';
-@@global.query_cache_limit = VARIABLE_VALUE
-1
-SELECT @@query_cache_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_limit';
-@@query_cache_limit = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_131_07----------------------#'
-SET @@global.query_cache_limit = TRUE;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1
-SET @@global.query_cache_limit = FALSE;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-0
-'#---------------------FN_DYNVARS_131_08----------------------#'
-SET @@global.query_cache_limit = 1;
-SELECT @@query_cache_limit = @@global.query_cache_limit;
-@@query_cache_limit = @@global.query_cache_limit
-1
-'#---------------------FN_DYNVARS_131_09----------------------#'
-SET query_cache_limit = 1;
-ERROR HY000: Variable 'query_cache_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_limit;
-@@query_cache_limit
-1
-SET local.query_cache_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
-SELECT local.query_cache_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_limit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1
-SELECT global.query_cache_limit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_limit = @@session.query_cache_limit;
-ERROR 42S22: Unknown column 'query_cache_limit' in 'field list'
-SET @@global.query_cache_limit = @start_value;
-SELECT @@global.query_cache_limit;
-@@global.query_cache_limit
-1048576

=== renamed file 'mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result' => 'mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result	2012-01-09 13:02:02 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic.result	2012-04-19 13:00:44 +0000
@@ -50,7 +50,7 @@ Warnings:
 Warning	1292	Truncated incorrect query_cache_min_res_unit value: '4294967296'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = 511;
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
@@ -71,23 +71,23 @@ Warnings:
 Warning	1292	Truncated incorrect query_cache_min_res_unit value: '42949672950'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = ON;
 ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 SET @@global.query_cache_min_res_unit = 'test';
 ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
 SELECT @@global.query_cache_min_res_unit;
 @@global.query_cache_min_res_unit
-0
+4294967288
 '#-------------------FN_DYNVARS_132_05----------------------------#'
 SET @@session.query_cache_min_res_unit = 0;
 ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT @@query_cache_min_res_unit;
 @@query_cache_min_res_unit
-0
+4294967288
 '#----------------------FN_DYNVARS_132_06------------------------#'
 SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 

=== removed file 'mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-SET @start_value = @@global.query_cache_min_res_unit;
-SELECT @start_value;
- at start_value
-4096
-'#--------------------FN_DYNVARS_132_01------------------------#'
-SET @@global.query_cache_min_res_unit = 99;
-SET @@global.query_cache_min_res_unit = DEFAULT;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4096
-'#---------------------FN_DYNVARS_132_02-------------------------#'
-SET @@global.query_cache_min_res_unit = @start_value;
-SELECT @@global.query_cache_min_res_unit = 4096;
-@@global.query_cache_min_res_unit = 4096
-1
-'#--------------------FN_DYNVARS_132_03------------------------#'
-SET @@global.query_cache_min_res_unit = 0;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 1;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 512;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 513;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-520
-SET @@global.query_cache_min_res_unit = 1048576;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-1048576
-SET @@global.query_cache_min_res_unit = 1048575;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-1048576
-'#--------------------FN_DYNVARS_132_04-------------------------#'
-SET @@global.query_cache_min_res_unit = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '-1'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '4294967296'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = 511;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '-1024'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = 42949672950;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_min_res_unit value: '42949672950'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-SET @@global.query_cache_min_res_unit = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_min_res_unit'
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4294967296
-'#-------------------FN_DYNVARS_132_05----------------------------#'
-SET @@session.query_cache_min_res_unit = 0;
-ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_min_res_unit;
-@@query_cache_min_res_unit
-4294967296
-'#----------------------FN_DYNVARS_132_06------------------------#'
-SELECT @@global.query_cache_min_res_unit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_min_res_unit';
-@@global.query_cache_min_res_unit = VARIABLE_VALUE
-1
-SELECT @@query_cache_min_res_unit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_min_res_unit';
-@@query_cache_min_res_unit = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_132_07----------------------#'
-SET @@global.query_cache_min_res_unit = TRUE;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-SET @@global.query_cache_min_res_unit = FALSE;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-512
-'#---------------------FN_DYNVARS_132_08----------------------#'
-SET @@global.query_cache_min_res_unit = 1;
-SELECT @@query_cache_min_res_unit = @@global.query_cache_min_res_unit;
-@@query_cache_min_res_unit = @@global.query_cache_min_res_unit
-1
-'#---------------------FN_DYNVARS_132_09----------------------#'
-SET query_cache_min_res_unit = 1;
-ERROR HY000: Variable 'query_cache_min_res_unit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_min_res_unit;
-@@query_cache_min_res_unit
-512
-SET local.query_cache_min_res_unit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
-SELECT local.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_min_res_unit = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1
-SELECT global.query_cache_min_res_unit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit;
-ERROR 42S22: Unknown column 'query_cache_min_res_unit' in 'field list'
-SET @@global.query_cache_min_res_unit = @start_value;
-SELECT @@global.query_cache_min_res_unit;
-@@global.query_cache_min_res_unit
-4096

=== renamed file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/query_cache_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result	2012-01-16 19:16:35 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-SET @start_value = @@global.query_cache_size;
-'#--------------------FN_DYNVARS_133_01------------------------#'
-SET @@global.query_cache_size = 99;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '99'
-SET @@global.query_cache_size = DEFAULT;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#---------------------FN_DYNVARS_133_02-------------------------#'
-SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = @start_value;
-@@global.query_cache_size = @start_value
-1
-'#--------------------FN_DYNVARS_133_03------------------------#'
-SET @@global.query_cache_size = 0;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 512;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '512'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1024;
-Warnings:
-Warning	1282	Query cache failed to set size 1024; new query cache size is 0
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 1048576;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-1048576
-SET @@global.query_cache_size = 1048575;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1048575'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-1047552
-'#--------------------FN_DYNVARS_133_04-------------------------#'
-SET @@global.query_cache_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '-1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 511;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '511'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '-1024'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = ON;
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'query_cache_size'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#-------------------FN_DYNVARS_133_05----------------------------#'
-SET @@session.query_cache_size = 0;
-ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_size;
-@@query_cache_size
-0
-'#----------------------FN_DYNVARS_133_06------------------------#'
-SELECT @@global.query_cache_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='query_cache_size';
-@@global.query_cache_size = VARIABLE_VALUE
-1
-SELECT @@query_cache_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='query_cache_size';
-@@query_cache_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_133_07----------------------#'
-SET @@global.query_cache_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-SET @@global.query_cache_size = FALSE;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
-'#---------------------FN_DYNVARS_133_08----------------------#'
-SET @@global.query_cache_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '1'
-SELECT @@query_cache_size = @@global.query_cache_size;
-@@query_cache_size = @@global.query_cache_size
-1
-'#---------------------FN_DYNVARS_133_09----------------------#'
-SET query_cache_size = 1;
-ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@query_cache_size;
-@@query_cache_size
-0
-SET local.query_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
-SELECT local.query_cache_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.query_cache_size = 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1
-SELECT global.query_cache_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT query_cache_size = @@session.query_cache_size;
-ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
-SET @@global.query_cache_size = @start_value;

=== renamed file 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-SET @start_global_value = @@global.range_alloc_block_size;
-SELECT @start_global_value;
- at start_global_value
-4096
-SET @start_session_value = @@session.range_alloc_block_size;
-SELECT @start_session_value;
- at start_session_value
-4096
-'#--------------------FN_DYNVARS_137_01-------------------------#'
-SET @@global.range_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '100'
-SET @@global.range_alloc_block_size = DEFAULT;
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '200'
-SET @@session.range_alloc_block_size = DEFAULT;
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-'#--------------------FN_DYNVARS_137_02-------------------------#'
-SET @@global.range_alloc_block_size = DEFAULT;
-SELECT @@global.range_alloc_block_size = 2048;
-@@global.range_alloc_block_size = 2048
-0
-SET @@session.range_alloc_block_size = DEFAULT;
-SELECT @@session.range_alloc_block_size = 2048;
-@@session.range_alloc_block_size = 2048
-0
-'#--------------------FN_DYNVARS_137_03-------------------------#'
-SET @@global.range_alloc_block_size = 2048;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '2048'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = 4294967294;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_137_04-------------------------#'
-SET @@session.range_alloc_block_size = 2048;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '2048'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967295'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = 4294967294;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967294'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-'#------------------FN_DYNVARS_137_05-----------------------#'
-SET @@global.range_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '-1024'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '42949672951'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@global.range_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = -2;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '-2'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SET @@session.range_alloc_block_size = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '4294967296'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-SET @@session.range_alloc_block_size = test;
-ERROR 42000: Incorrect argument type to variable 'range_alloc_block_size'
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4294966272
-'#------------------FN_DYNVARS_137_06-----------------------#'
-SELECT @@global.range_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='range_alloc_block_size';
-@@global.range_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_137_07-----------------------#'
-SELECT @@session.range_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='range_alloc_block_size';
-@@session.range_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_137_08-----------------------#'
-SET @@global.range_alloc_block_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '1'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@global.range_alloc_block_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '0'
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-'#---------------------FN_DYNVARS_137_09----------------------#'
-SET @@global.range_alloc_block_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '10'
-SELECT @@range_alloc_block_size = @@global.range_alloc_block_size;
-@@range_alloc_block_size = @@global.range_alloc_block_size
-0
-'#---------------------FN_DYNVARS_137_10----------------------#'
-SET @@range_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '100'
-SELECT @@range_alloc_block_size = @@local.range_alloc_block_size;
-@@range_alloc_block_size = @@local.range_alloc_block_size
-1
-SELECT @@local.range_alloc_block_size = @@session.range_alloc_block_size;
-@@local.range_alloc_block_size = @@session.range_alloc_block_size
-1
-'#---------------------FN_DYNVARS_137_11----------------------#'
-SET range_alloc_block_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect range_alloc_block_size value: '1'
-SELECT @@range_alloc_block_size;
-@@range_alloc_block_size
-4096
-SELECT local.range_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.range_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT range_alloc_block_size = @@session.range_alloc_block_size;
-ERROR 42S22: Unknown column 'range_alloc_block_size' in 'field list'
-SET @@global.range_alloc_block_size = @start_global_value;
-SELECT @@global.range_alloc_block_size;
-@@global.range_alloc_block_size
-4096
-SET @@session.range_alloc_block_size = @start_session_value;
-SELECT @@session.range_alloc_block_size;
-@@session.range_alloc_block_size
-4096

=== renamed file 'mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result' => 'mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result'
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result	2012-01-09 13:02:02 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic.result	2012-04-19 13:00:44 +0000
@@ -32,26 +32,14 @@ SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 123456789
 SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '4294967296'
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 4294967295
 SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '2199023255552'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967295
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 4294967295
 SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '4611686018427387904'
 SELECT @@global.rpl_recovery_rank;
 @@global.rpl_recovery_rank
 4294967295

=== removed file 'mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result	2011-12-12 22:58:40 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-SET @start_global_value = @@global.rpl_recovery_rank;
-SELECT @start_global_value;
- at start_global_value
-0
-'#--------------------FN_DYNVARS_142_01-------------------------#'
-SET @@global.rpl_recovery_rank = 500000;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SET @@global.rpl_recovery_rank = DEFAULT;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-'#--------------------FN_DYNVARS_142_02-------------------------#'
-SET @@global.rpl_recovery_rank = 0;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = 1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-1024
-SET @@global.rpl_recovery_rank = 123456789;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-123456789
-SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4294967296
-SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-2199023255552
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-2199023255552
-SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-4611686018427387904
-'#--------------------FN_DYNVARS_142_03-------------------------#'
-SET @@rpl_recovery_rank = 2;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@session.rpl_recovery_rank = 3;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SET @@local.rpl_recovery_rank = 4;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-'#------------------FN_DYNVARS_142_04-----------------------#'
-SET @@global.rpl_recovery_rank = -1;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-1'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = -2147483648;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-2147483648'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = -2147483649;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-Warning	1292	Truncated incorrect rpl_recovery_rank value: '-2147483649'
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-SET @@global.rpl_recovery_rank = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-SET @@global.rpl_recovery_rank = 2147483649.56;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-SET @@global.rpl_recovery_rank = 1G;
-ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank'
-'#------------------FN_DYNVARS_142_05-----------------------#'
-SET @@global.rpl_recovery_rank = 3000;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='rpl_recovery_rank';
-@@global.rpl_recovery_rank = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_142_06-----------------------#'
-SELECT count(VARIABLE_VALUE) 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='rpl_recovery_rank';
-count(VARIABLE_VALUE)
-1
-'#------------------FN_DYNVARS_142_07-----------------------#'
-SET @@global.rpl_recovery_rank = TRUE;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-1
-SET @@global.rpl_recovery_rank = FALSE;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@global.rpl_recovery_rank = 512;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@rpl_recovery_rank = @@global.rpl_recovery_rank;
-@@rpl_recovery_rank = @@global.rpl_recovery_rank
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET rpl_recovery_rank = 2048;
-ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT rpl_recovery_rank;
-ERROR 42S22: Unknown column 'rpl_recovery_rank' in 'field list'
-SELECT @@rpl_recovery_rank;
-@@rpl_recovery_rank
-512
-SET global rpl_recovery_rank = 64;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SET @@global.rpl_recovery_rank = @start_global_value;
-Warnings:
-Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0.
-SELECT @@global.rpl_recovery_rank;
-@@global.rpl_recovery_rank
-0

=== renamed file 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result' => 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-SET @start_global_value = @@global.slave_transaction_retries;
-SELECT @start_global_value;
- at 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;
-Warnings:
-Warning	1292	Truncated incorrect slave_transaction_retries value: '-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
-SET @@global.slave_transaction_retries = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'slave_transaction_retries'
-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

=== renamed file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-SET @start_global_value = @@global.sort_buffer_size;
-SET @start_session_value = @@session.sort_buffer_size;
-'#--------------------FN_DYNVARS_151_01-------------------------#'
-SET @@global.sort_buffer_size = 1000;
-SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-2097152
-SET @@session.sort_buffer_size = 2000;
-SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-2097152
-'#--------------------FN_DYNVARS_151_02-------------------------#'
-SET @@global.sort_buffer_size = DEFAULT;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-2097152
-SET @@session.sort_buffer_size = DEFAULT;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-2097152
-'#--------------------FN_DYNVARS_151_03-------------------------#'
-SET @@global.sort_buffer_size = 32776;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32776
-SET @@global.sort_buffer_size = 32777;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32777
-SET @@global.sort_buffer_size = 4294967295;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967295
-SET @@global.sort_buffer_size = 4294967294;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967294
-'#--------------------FN_DYNVARS_151_04-------------------------#'
-SET @@session.sort_buffer_size = 32776;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32776
-SET @@session.sort_buffer_size = 32777;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32777
-SET @@session.sort_buffer_size = 4294967295;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967295
-SET @@session.sort_buffer_size = 4294967294;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967294
-'#------------------FN_DYNVARS_151_05-----------------------#'
-SET @@global.sort_buffer_size = 32775;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-32775
-SET @@global.sort_buffer_size = -1024;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-SET @@global.sort_buffer_size = 4294967296;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@global.sort_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@global.sort_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-4294967296
-SET @@session.sort_buffer_size = 32775;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-32775
-SET @@session.sort_buffer_size = -2;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-1024
-SET @@session.sort_buffer_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-SET @@session.sort_buffer_size = 4294967296;
-SELECT @@session.sort_buffer_size;
-@@session.sort_buffer_size
-4294967296
-SET @@session.sort_buffer_size = test;
-ERROR 42000: Incorrect argument type to variable 'sort_buffer_size'
-'#------------------FN_DYNVARS_151_06-----------------------#'
-SELECT @@global.sort_buffer_size = VARIABLE_VALUE FROM 
-INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
-@@global.sort_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_151_07-----------------------#'
-SELECT @@session.sort_buffer_size = VARIABLE_VALUE FROM
-INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size';
-@@session.sort_buffer_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_151_08-----------------------#'
-SET @@global.sort_buffer_size = TRUE;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-SET @@global.sort_buffer_size = FALSE;
-SELECT @@global.sort_buffer_size;
-@@global.sort_buffer_size
-1024
-'#---------------------FN_DYNVARS_151_09----------------------#'
-SET @@global.sort_buffer_size = 9000;
-SELECT @@sort_buffer_size = @@global.sort_buffer_size;
-@@sort_buffer_size = @@global.sort_buffer_size
-0
-'#---------------------FN_DYNVARS_151_10----------------------#'
-SET @@sort_buffer_size = 9000;
-SELECT @@sort_buffer_size = @@local.sort_buffer_size;
-@@sort_buffer_size = @@local.sort_buffer_size
-1
-SELECT @@local.sort_buffer_size = @@session.sort_buffer_size;
-@@local.sort_buffer_size = @@session.sort_buffer_size
-1
-'#---------------------FN_DYNVARS_151_11----------------------#'
-SET sort_buffer_size = 9100;
-SELECT @@sort_buffer_size;
-@@sort_buffer_size
-9100
-SELECT local.sort_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.sort_buffer_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT sort_buffer_size = @@session.sort_buffer_size;
-ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
-SET @@global.sort_buffer_size = @start_global_value;
-SET @@session.sort_buffer_size = @start_session_value;

=== renamed file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	2011-12-02 18:49:05 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
- at start_global_value
-8192
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
- at start_session_value
-8192
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.transaction_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-@@global.transaction_alloc_block_size = 8192
-1
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-@@session.transaction_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-59392
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size =4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 123456789201;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '123456789201'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-SET @@global.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = 12345678901;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '12345678901'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@global.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@session.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
-1
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET transaction_alloc_block_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
-SELECT @@transaction_alloc_block_size;
-@@transaction_alloc_block_size
-1024
-SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024

=== renamed file 'mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result' => 'mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result'
=== removed file 'mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
- at start_global_value
-4096
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
- at start_session_value
-4096
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-@@global.transaction_prealloc_size = 4096
-1
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-@@session.transaction_prealloc_size = 4096
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '60020'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-59392
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '65535'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_prealloc_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@global.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@session.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
-@@transaction_prealloc_size = @@global.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-@@transaction_prealloc_size = @@local.transaction_prealloc_size
-1
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET transaction_prealloc_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1027'
-SELECT @@transaction_prealloc_size;
-@@transaction_prealloc_size
-1024
-SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096

=== renamed file 'mysql-test/suite/sys_vars/inc/binlog_cache_size_basic.inc' => 'mysql-test/suite/sys_vars/t/binlog_cache_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_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_ulong.inc
---source suite/sys_vars/inc/binlog_cache_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_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_ulong.inc
---source suite/sys_vars/inc/binlog_cache_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc' => 'mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-################################################################################
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit_ulong.inc
---source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-################################################################################
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit_ulong.inc
---source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc' => 'mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc
-

=== added file 'mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic.test	2012-04-19 13:00:44 +0000
@@ -0,0 +1,166 @@
+############### mysql-test\t\delayed_insert_limit_basic.test ###################
+#                                                                              #
+# Variable Name: delayed_insert_limit                                          #
+# Scope: GLOBAL                                                                #
+# Access Type: Dynamic                                                         #
+# Data Type: Numeric                                                           #
+# Default Value: 100                                                           #
+# Range: 1 - 4294967295                                                        #
+#                                                                              #
+#                                                                              #
+# Creation Date: 2008-02-07                                                    #
+# Author:  Salman Rawala                                                       #
+#                                                                              #
+# Description: Test Cases of Dynamic System Variable "delayed_insert_limit"    #
+#              that checks 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#option_mysqld_delayed_insert_limit       #
+#                                                                              #
+################################################################################
+
+--source include/load_sysvars.inc
+
+#################################################################
+#           START OF delayed_insert_limit TESTS                 #
+#################################################################
+
+#########################################################################
+# Saving initial value of delayed_insert_limit in a temporary variable  #
+#########################################################################
+
+SET @start_value = @@global.delayed_insert_limit;
+SELECT @start_value;
+
+--echo '#--------------------FN_DYNVARS_024_01------------------------#'
+######################################################################### 
+#              Display the DEFAULT value of delayed_insert_limit        #
+######################################################################### 
+
+SET @@global.delayed_insert_limit = 100;
+SET @@global.delayed_insert_limit = DEFAULT;
+SELECT @@global.delayed_insert_limit;
+
+
+--echo '#---------------------FN_DYNVARS_024_02-------------------------#'
+############################################### 
+#     Verify default value of variable        #
+############################################### 
+
+SET @@global.delayed_insert_limit = @start_value;
+SELECT @@global.delayed_insert_limit = 100;
+
+
+--echo '#--------------------FN_DYNVARS_024_03------------------------#'
+#########################################################################
+#        Change the value of delayed_insert_limit to a valid value      #
+#########################################################################
+
+SET @@global.delayed_insert_limit = 10000;
+SELECT @@global.delayed_insert_limit;
+SET @@global.delayed_insert_limit = 4294967295;
+SELECT @@global.delayed_insert_limit;
+SET @@global.delayed_insert_limit = 1;
+SELECT @@global.delayed_insert_limit;
+
+
+--echo '#--------------------FN_DYNVARS_024_04-------------------------#'
+############################################################################
+#         Change the value of delayed_insert_limit to invalid value        #
+############################################################################ 
+
+SET @@global.delayed_insert_limit = 0;
+SELECT @@global.delayed_insert_limit;
+SET @@global.delayed_insert_limit = -1024;
+SELECT @@global.delayed_insert_limit;
+SET @@global.delayed_insert_limit = 42949672950;
+SELECT @@global.delayed_insert_limit;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.delayed_insert_limit = 429496729.5;
+SELECT @@global.delayed_insert_limit;
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.delayed_insert_limit = ON;
+SELECT @@global.delayed_insert_limit;
+
+
+
+--echo '#-------------------FN_DYNVARS_024_05----------------------------#'
+############################################################################
+#       Test if accessing session delayed_insert_limit gives error         #
+############################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET @@session.delayed_insert_limit = 0;
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT @@Session.delayed_insert_limit;
+
+
+--echo '#----------------------FN_DYNVARS_024_06------------------------#'
+############################################################################## 
+# Check if the value in GLOBAL & SESSION Tables matches values in variable   #
+##############################################################################
+
+SELECT @@global.delayed_insert_limit =
+ VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+  WHERE VARIABLE_NAME='delayed_insert_limit';
+
+SELECT @@delayed_insert_limit =
+ VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+  WHERE VARIABLE_NAME='delayed_insert_limit';
+
+
+--echo '#---------------------FN_DYNVARS_024_07----------------------#'
+################################################################### 
+#      Check if TRUE and FALSE values can be used on variable     #
+################################################################### 
+
+SET @@global.delayed_insert_limit = TRUE;
+SELECT @@global.delayed_insert_limit;
+SET @@global.delayed_insert_limit = FALSE;
+SELECT @@global.delayed_insert_limit;
+
+--echo '#---------------------FN_DYNVARS_024_08----------------------#'
+########################################################################################################
+#    Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable  #
+########################################################################################################
+
+SET @@global.delayed_insert_limit = 1;
+SELECT @@delayed_insert_limit = @@global.delayed_insert_limit;
+
+
+--echo '#---------------------FN_DYNVARS_024_09----------------------#'
+##############################################################################
+#   Check if delayed_insert_limit can be accessed with and without @@ sign   #
+##############################################################################
+
+--Error ER_GLOBAL_VARIABLE
+SET delayed_insert_limit = 1;
+SELECT @@delayed_insert_limit;
+--Error ER_PARSE_ERROR
+SET local.delayed_insert_limit = 1;
+--Error ER_UNKNOWN_TABLE
+SELECT local.delayed_insert_limit;
+--Error ER_PARSE_ERROR
+SET global.delayed_insert_limit = 1;
+--Error ER_UNKNOWN_TABLE
+SELECT global.delayed_insert_limit;
+--Error ER_BAD_FIELD_ERROR
+SELECT delayed_insert_limit = @@session.delayed_insert_limit;
+
+##############################
+#   Restore initial value    #
+##############################
+
+SET @@global.delayed_insert_limit = @start_value;
+SELECT @@global.delayed_insert_limit;
+
+
+###########################################################
+#           END OF delayed_insert_limit TESTS             #
+###########################################################
+

=== removed file 'mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_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_ulong.inc
---source suite/sys_vars/inc/delayed_insert_limit_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_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_ulong.inc
---source suite/sys_vars/inc/delayed_insert_limit_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc' => 'mysql-test/suite/sys_vars/t/delayed_queue_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_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_ulong.inc
---source suite/sys_vars/inc/delayed_queue_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_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_ulong.inc
---source suite/sys_vars/inc/delayed_queue_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc' => 'mysql-test/suite/sys_vars/t/join_buffer_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/join_buffer_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/join_buffer_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc' => 'mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_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_ulong.inc
---source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_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_ulong.inc
---source suite/sys_vars/inc/key_cache_age_threshold_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/log_warnings_basic.inc' => 'mysql-test/suite/sys_vars/t/log_warnings_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/log_warnings_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/log_warnings_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_ulong.inc
---source suite/sys_vars/inc/log_warnings_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/log_warnings_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/log_warnings_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_ulong.inc
---source suite/sys_vars/inc/log_warnings_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc' => 'mysql-test/suite/sys_vars/t/max_connect_errors_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_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_ulong.inc
---source suite/sys_vars/inc/max_connect_errors_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_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_ulong.inc
---source suite/sys_vars/inc/max_connect_errors_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc' => 'mysql-test/suite/sys_vars/t/max_seeks_for_key_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_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_ulong.inc
---source suite/sys_vars/inc/max_seeks_for_key_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_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_ulong.inc
---source suite/sys_vars/inc/max_seeks_for_key_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc' => 'mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_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_ulong.inc
---source suite/sys_vars/inc/max_tmp_tables_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_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_ulong.inc
---source suite/sys_vars/inc/max_tmp_tables_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc' => 'mysql-test/suite/sys_vars/t/max_write_lock_count_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_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_ulong.inc
---source suite/sys_vars/inc/max_write_lock_count_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_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_ulong.inc
---source suite/sys_vars/inc/max_write_lock_count_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc' => 'mysql-test/suite/sys_vars/t/min_examined_row_limit_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_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_ulong.inc
---source suite/sys_vars/inc/min_examined_row_limit_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_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_ulong.inc
---source suite/sys_vars/inc/min_examined_row_limit_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/multi_range_count_basic.inc' => 'mysql-test/suite/sys_vars/t/multi_range_count_basic.test'
--- 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/t/multi_range_count_basic.test	2012-04-19 13:00:44 +0000
@@ -108,33 +108,48 @@ SELECT @@session.multi_range_count;
 
 SET @@global.multi_range_count = 0;
 SELECT @@global.multi_range_count;
+--disable_warnings
 SET @@global.multi_range_count = 4294967296;
+--enable_warnings
+--replace_result 4294967296 4294967295
 SELECT @@global.multi_range_count;
 SET @@global.multi_range_count = -1024;
 SELECT @@global.multi_range_count;
+--disable_warnings
 SET @@global.multi_range_count = 429496729500;
+--enable_warnings
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.multi_range_count = 65530.34;
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.multi_range_count = test;
+--replace_result 429496729500 4294967295
 SELECT @@global.multi_range_count;
 
 SET @@session.multi_range_count = 0;
 SELECT @@session.multi_range_count;
+--disable_warnings
 SET @@session.multi_range_count = 4294967296;
+--enable_warnings
+--replace_result 4294967296 4294967295
 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.;
+--disable_warnings
 SET @@session.multi_range_count = 4294967295021;
+--enable_warnings
+--replace_result 4294967295021 4294967295
 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;
+--replace_result 4294967295021 4294967295
 SELECT @@session.multi_range_count;
 
 

=== 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	2012-01-11 08:26:35 +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_ulong.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	2012-01-11 08:26:35 +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_ulong.inc
---source suite/sys_vars/inc/multi_range_count_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc' => 'mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic.test'
--- a/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic.test	2012-04-19 13:00:44 +0000
@@ -36,6 +36,7 @@
 #############################################################
 
 SET @start_global_value = @@global.myisam_max_sort_file_size;
+--replace_result 9223372036853727232 2146435072
 SELECT @start_global_value;
 
 --echo '#--------------------FN_DYNVARS_094_01-------------------------#'
@@ -45,6 +46,7 @@ SELECT @start_global_value;
 
 SET @@global.myisam_max_sort_file_size = 500000;
 SET @@global.myisam_max_sort_file_size = DEFAULT;
+--replace_result 9223372036853727232 2146435072
 SELECT @@global.myisam_max_sort_file_size;
 
 --echo '#--------------------FN_DYNVARS_094_02-------------------------#'
@@ -171,6 +173,7 @@ SET global myisam_max_sort_file_size = 6
 ####################################
 
 SET @@global.myisam_max_sort_file_size = @start_global_value;
+--replace_result 9223372036853727232 2146435072
 SELECT @@global.myisam_max_sort_file_size;
 
 ########################################################

=== removed file 'mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_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_ulong.inc
---source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_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_ulong.inc
---source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc' => 'mysql-test/suite/sys_vars/t/myisam_repair_threads_basic.test'
--- a/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic.test	2012-04-19 13:00:44 +0000
@@ -109,29 +109,36 @@ SELECT @@global.myisam_repair_threads ;
 
 SET @@global.myisam_repair_threads  = -1024;
 SELECT @@global.myisam_repair_threads ;
-
+--disable_warnings
 SET @@global.myisam_repair_threads  = 429496729533;
+--enable_warnings
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = 65530.34;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = test;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = "test";
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = 'test';
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_repair_threads  = ON;
+--replace_result 429496729533 4294967295
 SELECT @@global.myisam_repair_threads ;
 
 

=== removed file 'mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_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_ulong.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_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_ulong.inc
---source suite/sys_vars/inc/myisam_repair_threads_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc' => 'mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test'
--- a/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test	2012-04-19 13:00:44 +0000
@@ -109,28 +109,36 @@ SELECT @@global.myisam_sort_buffer_size
 SET @@global.myisam_sort_buffer_size   = -1024;
 SELECT @@global.myisam_sort_buffer_size  ;
 
+--disable_warnings
 SET @@global.myisam_sort_buffer_size   = 429496729533;
+--enable_warnings
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = 65530.34;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = test;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = "test";
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = 'test';
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@global.myisam_sort_buffer_size   = ON;
+--replace_result 429496729533 4294967295 
 SELECT @@global.myisam_sort_buffer_size  ;
 
 

=== removed file 'mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc' => 'mysql-test/suite/sys_vars/t/net_retry_count_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/net_retry_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_ulong.inc
---source suite/sys_vars/inc/net_retry_count_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/net_retry_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_ulong.inc
---source suite/sys_vars/inc/net_retry_count_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc' => 'mysql-test/suite/sys_vars/t/query_alloc_block_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/query_alloc_block_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/query_alloc_block_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc' => 'mysql-test/suite/sys_vars/t/query_cache_limit_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_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_ulong.inc
---source suite/sys_vars/inc/query_cache_limit_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_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_ulong.inc
---source suite/sys_vars/inc/query_cache_limit_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc' => 'mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_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_ulong.inc
---source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_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_ulong.inc
---source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc' => 'mysql-test/suite/sys_vars/t/query_cache_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_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_ulong.inc
---source suite/sys_vars/inc/query_cache_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_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_ulong.inc
---source suite/sys_vars/inc/query_cache_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc' => 'mysql-test/suite/sys_vars/t/range_alloc_block_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/range_alloc_block_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/range_alloc_block_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc' => 'mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic.test'
--- a/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic.test	2012-04-19 13:00:44 +0000
@@ -57,12 +57,21 @@ SET @@global.rpl_recovery_rank = 1024;
 SELECT @@global.rpl_recovery_rank;
 SET @@global.rpl_recovery_rank = 123456789;
 SELECT @@global.rpl_recovery_rank;
+
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*2;
+--enable_warnings
+--replace_result 4294967296 4294967295
 SELECT @@global.rpl_recovery_rank;
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*1024;
+--enable_warnings
+--replace_result 2199023255552 4294967295
 SELECT @@global.rpl_recovery_rank;
-SELECT @@global.rpl_recovery_rank;
+--disable_warnings
 SET @@global.rpl_recovery_rank = 2147483648*2147483648;
+--enable_warnings
+--replace_result 4611686018427387904 4294967295
 SELECT @@global.rpl_recovery_rank;
 
 

=== removed file 'mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_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_ulong.inc
---source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_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_ulong.inc
---source suite/sys_vars/inc/rpl_recovery_rank_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc' => 'mysql-test/suite/sys_vars/t/slave_transaction_retries_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_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_ulong.inc
---source suite/sys_vars/inc/slave_transaction_retries_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_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_ulong.inc
---source suite/sys_vars/inc/slave_transaction_retries_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc' => 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/sort_buffer_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_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_ulong.inc
---source suite/sys_vars/inc/sort_buffer_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc' => 'mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_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_ulong.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-

=== renamed file 'mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc' => 'mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test'
=== removed file 'mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_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_ulong.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-

=== removed file 'mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	2012-01-11 08:26:35 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_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_ulong.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-

=== modified file 'sql/sql_cache.cc'
--- a/sql/sql_cache.cc	2012-03-27 23:04:46 +0000
+++ b/sql/sql_cache.cc	2012-04-19 13:00:44 +0000
@@ -1348,9 +1348,10 @@ ulong Query_cache::resize(ulong query_ca
 
 ulong Query_cache::set_min_res_unit(ulong size)
 {
+  DBUG_ASSERT(size % 8 == 0);
   if (size < min_allocation_unit)
-    size= min_allocation_unit;
-  return (min_result_data_size= ALIGN_SIZE(size));
+    size= ALIGN_SIZE(min_allocation_unit);
+  return (min_result_data_size= size);
 }
 
 

=== modified file 'sql/sql_cache.h'
--- a/sql/sql_cache.h	2012-02-15 17:08:08 +0000
+++ b/sql/sql_cache.h	2012-04-19 13:00:44 +0000
@@ -41,7 +41,7 @@ typedef struct st_changed_table_list CHA
 #define QUERY_CACHE_DEF_TABLE_HASH_SIZE		1024
 
 /* minimal result data size when data allocated */
-#define QUERY_CACHE_MIN_RESULT_DATA_SIZE	1024*4
+#define QUERY_CACHE_MIN_RESULT_DATA_SIZE	(1024*4)
 
 /* 
    start estimation of first result block size only when number of queries

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2012-03-27 23:04:46 +0000
+++ b/sql/sys_vars.cc	2012-04-19 13:00:44 +0000
@@ -1892,7 +1892,7 @@ static Sys_var_ulong Sys_query_cache_min
        "The minimum size for blocks allocated by the query cache",
        GLOBAL_VAR(query_cache_min_res_unit), CMD_LINE(REQUIRED_ARG),
        VALID_RANGE(0, UINT_MAX), DEFAULT(QUERY_CACHE_MIN_RESULT_DATA_SIZE),
-       BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
+       BLOCK_SIZE(8), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_qcache_min_res_unit));
 
 static const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND", 0 };



More information about the commits mailing list