List:Commits« Previous MessageNext Message »
From:Tanjot Uppal Date:October 22 2012 1:54pm
Subject:bzr push into mysql-5.6 branch (tanjot.uppal:4464 to 4465)
View as plain text  
 4465 Tanjot Uppal	2012-10-22
      added server defaults tests and fixed suite/engines/funcs/t/crash_manytables_number.test and suite/engines/funcs/t/crash_manytables_string.test

    added:
      mysql-test/r/host_cache_size_functionality.result
      mysql-test/r/table_definition_cache_functionality.result
      mysql-test/suite/engines/funcs/t/crash_manytables_number.cnf
      mysql-test/suite/engines/funcs/t/crash_manytables_string.cnf
      mysql-test/t/host_cache_size_functionality.test
      mysql-test/t/sort_buffer_size_functionality.test
      mysql-test/t/table_definition_cache_functionality.test
    modified:
      mysql-test/r/sort_buffer_size_functionality.result
      mysql-test/suite/engines/funcs/r/crash_manytables_number.result
      mysql-test/suite/engines/funcs/r/crash_manytables_string.result
      mysql-test/suite/engines/funcs/t/crash_manytables_number.test
      mysql-test/suite/engines/funcs/t/crash_manytables_string.test
      mysql-test/t/query_cache_size_functionality.test
      mysql-test/t/query_cache_type_functionality.test
 4464 viswanatham gudipati	2012-10-22
      Disable valgrind

    modified:
      mysql-test/suite/innodb/t/innodb_wl6347_comp_indx_stat.test
=== added file 'mysql-test/r/host_cache_size_functionality.result'
--- a/mysql-test/r/host_cache_size_functionality.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/host_cache_size_functionality.result	2012-10-22 13:43:09 +0000
@@ -0,0 +1,78 @@
+'#________________________VAR_06_Host_Cache_Size__________________#'
+echo '##'
+--echo '#---------------------WL6372_VAR_6_01----------------------#'
+####################################################################
+#   Checking default value                                         #
+####################################################################
+SELECT COUNT(@@GLOBAL.Host_Cache_Size)
+1 Expected
+set @Default_host_cache_size=(select if(if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))>2000,2000,if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))));
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+@@global.Host_Cache_Size=@Default_host_cache_size
+1
+1 Expected
+'#---------------------WL6372_VAR_6_02----------------------#'
+# Restart server with Host_Cache_Size 1
+SELECT @@GLOBAL.Host_Cache_Size;
+@@GLOBAL.Host_Cache_Size
+1
+1 Expected
+set @Default_host_cache_size=(select if(if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))>2000,2000,if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))));
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+@@global.Host_Cache_Size=@Default_host_cache_size
+1
+1 Expected
+'#---------------------WL6372_VAR_6_03----------------------#'
+SET @@local.Host_Cache_Size=1;
+ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
+Expected error 'Global variable'
+SET @@session.Host_Cache_Size=1;
+ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
+Expected error 'Global variable'
+SET @@GLOBAL.Host_Cache_Size=1;
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+COUNT(@@GLOBAL.Host_Cache_Size)
+1
+1 Expected
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+@@global.Host_Cache_Size=@Default_host_cache_size
+1
+1 Expected
+'#---------------------WL6372_VAR_6_04----------------------#'
+SELECT @@GLOBAL.Host_Cache_Size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='Host_Cache_Size';
+@@GLOBAL.Host_Cache_Size = VARIABLE_VALUE
+1
+1 Expected
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+COUNT(@@GLOBAL.Host_Cache_Size)
+1
+1 Expected
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='Host_Cache_Size';
+COUNT(VARIABLE_VALUE)
+1
+1 Expected
+'#---------------------WL6372_VAR_6_05----------------------#'
+SELECT @@Host_Cache_Size = @@GLOBAL.Host_Cache_Size;
+@@Host_Cache_Size = @@GLOBAL.Host_Cache_Size
+1
+1 Expected
+SELECT COUNT(@@local.Host_Cache_Size);
+ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@SESSION.Host_Cache_Size);
+ERROR HY000: Variable 'host_cache_size' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+COUNT(@@GLOBAL.Host_Cache_Size)
+1
+1 Expected
+SELECT Host_Cache_Size = @@SESSION.Host_Cache_Size;
+ERROR 42S22: Unknown column 'Host_Cache_Size' in 'field list'
+Expected error 'Unknown column Host_Cache_Size in field list'
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;

=== modified file 'mysql-test/r/sort_buffer_size_functionality.result'
--- a/mysql-test/r/sort_buffer_size_functionality.result	2012-10-09 12:36:52 +0000
+++ b/mysql-test/r/sort_buffer_size_functionality.result	2012-10-22 13:43:09 +0000
@@ -3,11 +3,30 @@ SELECT COUNT(@@GLOBAL.sort_buffer_size);
 COUNT(@@GLOBAL.sort_buffer_size)
 1
 1 Expected
+SELECT COUNT(@@SESSION.sort_buffer_size);
+COUNT(@@SESSION.sort_buffer_size)
+1
+1 Expected
 SELECT @@GLOBAL.sort_buffer_size;
 @@GLOBAL.sort_buffer_size
 262144
 262144 Expected
+SELECT @@SESSION.sort_buffer_size;
+@@SESSION.sort_buffer_size
+262144
+262144 Expected
 '#---------------------WL6372_VAR_8_02----------------------#'
+# Restart server with sort_buffer_size 9999999;
+SELECT @@GLOBAL.sort_buffer_size;
+@@GLOBAL.sort_buffer_size
+9999999
+9999999 Expected
+SET @@GLOBAL.sort_buffer_size=DEFAULT;
+SELECT @@GLOBAL.sort_buffer_size;
+@@GLOBAL.sort_buffer_size
+262144
+262144 Expected
+'#---------------------WL6372_VAR_8_03----------------------#'
 SET @@local.sort_buffer_size=9999999;
 SET @@session.sort_buffer_size=9999999;
 SET @@GLOBAL.sort_buffer_size=9999999;
@@ -18,15 +37,7 @@ SELECT @@GLOBAL.sort_buffer_size;
 @@GLOBAL.sort_buffer_size
 262144
 262144 Expected
-SELECT @@SESSION.sort_buffer_size;
-@@SESSION.sort_buffer_size
-262144
-262144 Expected
-SELECT @@LOCAL.sort_buffer_size;
-@@LOCAL.sort_buffer_size
-262144
-262144 Expected
-'#---------------------WL6372_VAR_8_03----------------------#'
+'#---------------------WL6372_VAR_8_04----------------------#'
 SELECT @@GLOBAL.sort_buffer_size = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='sort_buffer_size';
@@ -49,11 +60,11 @@ WHERE VARIABLE_NAME='sort_buffer_size';
 COUNT(VARIABLE_VALUE)
 1
 1 Expected
-'#---------------------WL6372_VAR_8_04----------------------#'
+'#---------------------WL6372_VAR_8_05----------------------#'
 SELECT @@sort_buffer_size = @@GLOBAL.sort_buffer_size;
 @@sort_buffer_size = @@GLOBAL.sort_buffer_size
-1
-1 Expected
+0
+0 Expected
 SELECT COUNT(@@sort_buffer_size);
 COUNT(@@sort_buffer_size)
 1
@@ -73,12 +84,33 @@ COUNT(@@GLOBAL.sort_buffer_size)
 SELECT sort_buffer_size = @@SESSION.sort_buffer_size;
 ERROR 42S22: Unknown column 'sort_buffer_size' in 'field list'
 Expected error 'Unknown column sort_buffer_size in field list'
-'#---------------------WL6372_VAR_8_05----------------------#'
+'#---------------------WL6372_VAR_8_06----------------------#'
+SET @@GLOBAL.sort_buffer_size=32767;
+SET @@session.sort_buffer_size=32767;
+SELECT @@GLOBAL.sort_buffer_size;
+@@GLOBAL.sort_buffer_size
+32768
+32768 Expected
+select @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32768
+32768 Expected
+SET @@global.sort_buffer_size=-1;
+SET @@session.sort_buffer_size=-1;
+select @@session.sort_buffer_size;
+@@session.sort_buffer_size
+32768
+32768 Expected
+SELECT @@GLOBAL.sort_buffer_size;
+@@GLOBAL.sort_buffer_size
+32768
+32768 Expected
+'#---------------------WL6372_VAR_8_07----------------------#'
 Check the size of the vardir
 The output size is in unit blocks
 TRUE
 TRUE Expected
-'#---------------------WL6372_VAR_8_06----------------------#'
+'#---------------------WL6372_VAR_8_08----------------------#'
 # create a table
 ===============
 create table & Index
@@ -111,74 +143,58 @@ VALUES (@col_1);
 INSERT INTO tab1
 VALUES (@col_1);
 commit;
-select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes';
+flush status;
+flush table;
+SET @@GLOBAL.sort_buffer_size=32768;
+SET @@SESSION.sort_buffer_size=32768;
+select variable_value from information_schema.session_status where variable_name ='Sort_merge_passes';
 variable_value
 0
 0 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_rows';
+select variable_value from information_schema.session_status where variable_name ='Sort_rows';
 variable_value
-732
-732 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_scan';
+0
+0 Expected
+select variable_value from information_schema.session_status where variable_name ='Sort_scan';
 variable_value
-7
-7 Expected
+0
+0 Expected
+set @Sort_merge_passes = (select variable_value from information_schema.session_status where variable_name ='Sort_merge_passes');
+set @Sort_rows = (select variable_value from information_schema.session_status where variable_name ='Sort_rows');
+set @Sort_scan = (select variable_value from information_schema.session_status where variable_name ='Sort_scan');
 select count(1) from (select b.* from tab1 b inner join tab1 c inner join tab1 d inner join tab1 e inner join tab1 f order by 1) a;
 count(1)
 100000
 100000 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes';
-variable_value
+select ( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 537;
+( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 537
+1
+1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 100000;
+(select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 100000
+1
+1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 1;
+(select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 1
 1
 1 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_rows';
-variable_value
-100732
-100732 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_scan';
-variable_value
-8
-8 Expected
 select count(1) from (select b.* from tab1 b inner join tab1 c inner join tab1 d inner join tab1 e inner join tab1 f order by 1) a;
 count(1)
 100000
 100000 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes';
-variable_value
-2
-2 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_rows';
-variable_value
-200732
-200732 Expected
-select variable_value from information_schema.global_status where variable_name ='Sort_scan';
-variable_value
-9
-9 Expected
-'#---------------------WL6372_VAR_8_07----------------------#'
-# Restart server with sort_buffer_size 9999999;
-SELECT @@GLOBAL.sort_buffer_size;
-@@GLOBAL.sort_buffer_size
-9999999
-9999999 Expected
-SELECT @@SESSION.sort_buffer_size;
-@@SESSION.sort_buffer_size
-9999999
-9999999 Expected
-SET @@GLOBAL.sort_buffer_size=DEFAULT;
-SELECT @@GLOBAL.sort_buffer_size;
-@@GLOBAL.sort_buffer_size
-262144
-262144 Expected
-SET @@SESSION.sort_buffer_size=DEFAULT;
-SELECT @@SESSION.sort_buffer_size;
-@@SESSION.sort_buffer_size
-262144
-262144 Expected
-SET @@LOCAL.sort_buffer_size=DEFAULT;
-SELECT @@LOCAL.sort_buffer_size;
-@@LOCAL.sort_buffer_size
-262144
-262144 Expected
+select ( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 1074;
+( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 1074
+1
+1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 200000;
+(select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 200000
+1
+1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 2;
+(select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 2
+1
+1 Expected
 #cleanup
 DROP TABLE IF EXISTS tab1;
+SET @@session.sort_buffer_size=DEFAULT;
+SET @@GLOBAL.sort_buffer_size=DEFAULT;

=== added file 'mysql-test/r/table_definition_cache_functionality.result'
--- a/mysql-test/r/table_definition_cache_functionality.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/table_definition_cache_functionality.result	2012-10-22 13:43:09 +0000
@@ -0,0 +1,146 @@
+'#________________________VAR_05_table_definition_cache__________________#'
+echo '##'
+--echo '#---------------------WL6372_VAR_5_01----------------------#'
+####################################################################
+#   Checking default value                                         #
+####################################################################
+SELECT COUNT(@@GLOBAL.table_definition_cache)
+1 Expected
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+SELECT @@GLOBAL.table_definition_cache;
+@@GLOBAL.table_definition_cache
+1400
+1400 Expected
+'#---------------------WL6372_VAR_5_02----------------------#'
+# Restart server with table_definition_cache 1
+SELECT @@GLOBAL.table_definition_cache;
+@@GLOBAL.table_definition_cache
+2000
+2000 Expected
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+SELECT @@GLOBAL.table_definition_cache;
+@@GLOBAL.table_definition_cache
+1400
+1400 Expected
+'#---------------------WL6372_VAR_5_03----------------------#'
+SET @@local.table_definition_cache=1;
+ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable and should be set with SET GLOBAL
+Expected error 'Global variable'
+SET @@session.table_definition_cache=1;
+ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable and should be set with SET GLOBAL
+Expected error 'Global variable'
+SET @@GLOBAL.table_definition_cache=1;
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+SELECT @@GLOBAL.table_definition_cache;
+@@GLOBAL.table_definition_cache
+1400
+1400 Expected
+'#---------------------WL6372_VAR_5_04----------------------#'
+SELECT @@GLOBAL.table_definition_cache = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='table_definition_cache';
+@@GLOBAL.table_definition_cache = VARIABLE_VALUE
+1
+1 Expected
+SELECT COUNT(@@GLOBAL.table_definition_cache);
+COUNT(@@GLOBAL.table_definition_cache)
+1
+1 Expected
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='table_definition_cache';
+COUNT(VARIABLE_VALUE)
+1
+1 Expected
+'#---------------------WL6372_VAR_5_05----------------------#'
+SELECT @@table_definition_cache = @@GLOBAL.table_definition_cache;
+@@table_definition_cache = @@GLOBAL.table_definition_cache
+1
+1 Expected
+SELECT COUNT(@@local.table_definition_cache);
+ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@SESSION.table_definition_cache);
+ERROR HY000: Variable 'table_definition_cache' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@GLOBAL.table_definition_cache);
+COUNT(@@GLOBAL.table_definition_cache)
+1
+1 Expected
+SELECT table_definition_cache = @@SESSION.table_definition_cache;
+ERROR 42S22: Unknown column 'table_definition_cache' in 'field list'
+Expected error 'Unknown column table_definition_cache in field list'
+'#---------------------WL6372_VAR_5_06----------------------#'
+Check the size of the vardir
+The output size is in unit blocks
+TRUE
+TRUE Expected
+'#---------------------WL6372_VAR_5_07----------------------#'
+flush tables;
+flush status;
+set @Open_table_definitions = (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions');
+set @Opened_table_definitions = (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions');
+# create 2 tables 
+DROP TABLE IF EXISTS tab1;
+DROP TABLE IF EXISTS tab2;
+===============
+create table & Index
+===============
+CREATE TABLE tab1 (col_1 text(10))
+ENGINE=INNODB ;
+===============
+create table & Index
+===============
+CREATE TABLE tab2 (col_1 text(10))
+ENGINE=INNODB ;
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions;
+(select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 2;
+(select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 2
+1
+1 Expected
+# open two tables
+select 1 from tab1;
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1;
+(select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 3;
+(select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 3
+1
+1 Expected
+select 1 from tab2;
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 2;
+(select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 2
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+(select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4
+1
+1 Expected
+DROP TABLE IF EXISTS tab1;
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1;
+(select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+(select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4
+1
+1 Expected
+DROP TABLE IF EXISTS tab2;
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions;
+(select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions
+1
+1 Expected
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+(select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4
+1
+1 Expected
+#cleanup
+set @@GLOBAL.table_definition_cache=DEFAULT;

=== modified file 'mysql-test/suite/engines/funcs/r/crash_manytables_number.result'
--- a/mysql-test/suite/engines/funcs/r/crash_manytables_number.result	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/r/crash_manytables_number.result	2012-10-22 13:43:09 +0000
@@ -2999,3 +2999,4 @@ DROP TABLE t997 ;
 DROP TABLE t998 ;
 DROP TABLE t999 ;
 DROP TABLE t1000 ;
+call mtr.add_suppression("Changed limits: max_open_files:*");

=== modified file 'mysql-test/suite/engines/funcs/r/crash_manytables_string.result'
--- a/mysql-test/suite/engines/funcs/r/crash_manytables_string.result	2010-03-18 06:42:07 +0000
+++ b/mysql-test/suite/engines/funcs/r/crash_manytables_string.result	2012-10-22 13:43:09 +0000
@@ -2999,3 +2999,4 @@ DROP TABLE t997 ;
 DROP TABLE t998 ;
 DROP TABLE t999 ;
 DROP TABLE t1000 ;
+call mtr.add_suppression("Changed limits: max_open_files:*");

=== added file 'mysql-test/suite/engines/funcs/t/crash_manytables_number.cnf'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_number.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_number.cnf	2012-10-22 13:43:09 +0000
@@ -0,0 +1,4 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+open_files_limit=0

=== modified file 'mysql-test/suite/engines/funcs/t/crash_manytables_number.test'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_number.test	2012-04-17 13:14:25 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_number.test	2012-10-22 13:43:09 +0000
@@ -1,6 +1,5 @@
 #Want to skip this test from daily Valgrind execution
 --source include/no_valgrind_without_big.inc
-
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
@@ -3005,3 +3004,4 @@ DROP TABLE t998 ;
 DROP TABLE t999 ;
 DROP TABLE t1000 ;
 
+call mtr.add_suppression("Changed limits: max_open_files:*");

=== added file 'mysql-test/suite/engines/funcs/t/crash_manytables_string.cnf'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_string.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_string.cnf	2012-10-22 13:43:09 +0000
@@ -0,0 +1,4 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+open_files_limit=0

=== modified file 'mysql-test/suite/engines/funcs/t/crash_manytables_string.test'
--- a/mysql-test/suite/engines/funcs/t/crash_manytables_string.test	2012-05-04 08:06:56 +0000
+++ b/mysql-test/suite/engines/funcs/t/crash_manytables_string.test	2012-10-22 13:43:09 +0000
@@ -3003,4 +3003,4 @@ DROP TABLE t997 ;
 DROP TABLE t998 ;
 DROP TABLE t999 ;
 DROP TABLE t1000 ;
-
+call mtr.add_suppression("Changed limits: max_open_files:*");

=== added file 'mysql-test/t/host_cache_size_functionality.test'
--- a/mysql-test/t/host_cache_size_functionality.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/host_cache_size_functionality.test	2012-10-22 13:43:09 +0000
@@ -0,0 +1,183 @@
+###############################################################################
+#                                                                             #
+# Variable Name: Host_Cache_Size                                              #
+# Scope: Global                                                               #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2012-08-31                                                   #
+# Author : Tanjot Singh Uppal                                                 #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable Host_Cache_Size           #
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+#              * Functionality Check                                          #
+#              * Accessability Check                                          #
+#                                                                             #               
+# This test does not perform the crash recovery on this variable              # 
+# For crash recovery test on default change please run the ibtest             #
+###############################################################################
+
+-- source include/have_innodb.inc
+-- source include/not_embedded.inc
+-- source include/have_innodb_16k.inc
+--disable_warnings
+echo '#________________________VAR_06_Host_Cache_Size__________________#'
+echo '##'
+--echo '#---------------------WL6372_VAR_6_01----------------------#'
+####################################################################
+#   Checking default value                                         #
+####################################################################
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+--echo 1 Expected
+
+set @Default_host_cache_size=(select if(if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))>2000,2000,if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))));
+
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+--echo 1 Expected
+
+
+--echo '#---------------------WL6372_VAR_6_02----------------------#'
+#################################################################################
+# Checking the Default value post starting the server with other value          #
+#################################################################################
+--echo # Restart server with Host_Cache_Size 1
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+-- exec echo "restart:--host_cache_size=1  " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- enable_reconnect
+-- source include/wait_until_connected_again.inc
+
+--disable_warnings
+
+SELECT @@GLOBAL.Host_Cache_Size;
+--echo 1 Expected
+
+set @Default_host_cache_size=(select if(if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))>2000,2000,if(@@global.max_connections<500,128+@@global.max_connections,128+@@global.max_connections+floor((@@global.max_connections-500)/20))));
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+--echo 1 Expected
+
+
+--echo '#---------------------WL6372_VAR_6_03----------------------#'
+####################################################################
+#   Checking Value can be set - Dynamic                            #
+####################################################################
+--error ER_GLOBAL_VARIABLE 
+SET @@local.Host_Cache_Size=1;
+--echo Expected error 'Global variable'
+
+--error ER_GLOBAL_VARIABLE 
+SET @@session.Host_Cache_Size=1;
+--echo Expected error 'Global variable'
+
+SET @@GLOBAL.Host_Cache_Size=1;
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;
+
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+--echo 1 Expected
+
+select @@global.Host_Cache_Size=@Default_host_cache_size;
+--echo 1 Expected
+
+--echo '#---------------------WL6372_VAR_6_04----------------------#'
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+SELECT @@GLOBAL.Host_Cache_Size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='Host_Cache_Size';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='Host_Cache_Size';
+--echo 1 Expected
+
+--echo '#---------------------WL6372_VAR_6_05----------------------#'
+################################################################################
+#  Checking Variable Scope                                                     #
+################################################################################
+SELECT @@Host_Cache_Size = @@GLOBAL.Host_Cache_Size;
+--echo 1 Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@local.Host_Cache_Size);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.Host_Cache_Size);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT COUNT(@@GLOBAL.Host_Cache_Size);
+--echo 1 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT Host_Cache_Size = @@SESSION.Host_Cache_Size;
+--echo Expected error 'Unknown column Host_Cache_Size in field list'
+
+#The below check has been commented out as the IP fetch is different in a P2P connection than BroadBand connection
+#--echo '#---------------------WL6372_VAR_6_06----------------------#'
+###############################################################################
+# Checking the Host   cahce functionality                                     #
+###############################################################################
+
+#SET @@GLOBAL.Host_Cache_Size=2;
+#--disable_warnings
+
+#--perl
+#my $ip=`ifconfig | egrep "inet addr|inet" | sed -e 's/^.*inet addr://' -e 's/^.*inet//'| sed 's/ .*\$//'|egrep -i "broadcast|bcast"|head -1|awk '{print $1}'`;
+#open (LOGFH, ">" . $ENV{'MYSQL_TMP_DIR'} . "/bind_ip");
+#print LOGFH "let \$bind_ip = $ip;\n";
+#close LOGFH;
+#EOF
+
+#--source $MYSQL_TMP_DIR/bind_ip
+#--remove_file $MYSQL_TMP_DIR/bind_ip
+
+#let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+#--exec echo "wait" > $restart_file
+#--shutdown_server 10
+#--source include/wait_until_disconnected.inc
+#-- exec echo "restart:--bind-address=$bind_ip  " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+#-- enable_reconnect
+#-- source include/wait_until_connected_again.inc
+
+#connection default;
+#--disable_warnings
+
+#create user binduser;
+#grant all on *.* to binduser;
+
+#select count(IP) from performance_schema.host_cache;
+#--echo 0 Expected
+
+#connect (con1,$bind_ip,binduser,,);
+#select count(IP) from performance_schema.host_cache;
+#--echo 1 Expected
+
+#disconnect con1;
+#connection default;
+
+#--disable_warnings
+
+# The below check is hashed until the BUG14689561# is fixed
+#
+#flush hosts;
+
+#connect (con2,$bind_ip,binduser,,);
+#select count(IP) from performance_schema.host_cache;
+#--echo 1 Expected
+
+#disconnect con2;
+
+SET @@GLOBAL.Host_Cache_Size=DEFAULT;

=== modified file 'mysql-test/t/query_cache_size_functionality.test'
--- a/mysql-test/t/query_cache_size_functionality.test	2012-10-09 12:36:52 +0000
+++ b/mysql-test/t/query_cache_size_functionality.test	2012-10-22 13:43:09 +0000
@@ -134,7 +134,7 @@ SELECT query_cache_size = @@SESSION.quer
 
 --echo '#---------------------WL6372_VAR_2_07----------------------#'
 #################################################################################
-# Checking the size of table cache functionality                                #
+# Checking the size of query cache functionality                                #
 #################################################################################
 --echo # create 1 table and insert 3 rows each
 --disable_warnings

=== modified file 'mysql-test/t/query_cache_type_functionality.test'
--- a/mysql-test/t/query_cache_type_functionality.test	2012-10-09 12:36:52 +0000
+++ b/mysql-test/t/query_cache_type_functionality.test	2012-10-22 13:43:09 +0000
@@ -140,7 +140,7 @@ SELECT query_cache_type = @@SESSION.quer
 
 --echo '#---------------------WL6372_VAR_3_07----------------------#'
 #################################################################################
-# Checking the size of table cache functionality                                #
+# Checking the size of query cache functionality                                #
 #################################################################################
 --echo # create 1 table and insert 3 rows each
 

=== added file 'mysql-test/t/sort_buffer_size_functionality.test'
--- a/mysql-test/t/sort_buffer_size_functionality.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/sort_buffer_size_functionality.test	2012-10-22 13:43:09 +0000
@@ -0,0 +1,226 @@
+###############################################################################
+#                                                                             #
+# Variable Name: sort_buffer_size                                             #
+# Scope: Global/Session                                                       #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2012-08-31                                                   #
+# Author : Tanjot Singh Uppal                                                 #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable sort_buffer_size          #
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+#              * Functionality Check                                          #
+#              * Accessability Check                                          #
+#                                                                             #
+###############################################################################
+
+-- source include/have_innodb.inc
+-- source include/not_embedded.inc
+-- source include/have_innodb_16k.inc
+
+--echo '#---------------------WL6372_VAR_8_01----------------------#'
+####################################################################
+#   Checking default value                                         #
+####################################################################
+SELECT COUNT(@@GLOBAL.sort_buffer_size);
+--echo 1 Expected
+SELECT COUNT(@@SESSION.sort_buffer_size);
+--echo 1 Expected
+
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 262144 Expected
+SELECT @@SESSION.sort_buffer_size;
+--echo 262144 Expected
+
+
+--echo '#---------------------WL6372_VAR_8_02----------------------#'
+#################################################################################
+# Checking the Default value post starting the server with other value          #
+#################################################################################
+--echo # Restart server with sort_buffer_size 9999999;
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+-- exec echo "restart:--sort_buffer_size=9999999 " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- enable_reconnect
+-- source include/wait_until_connected_again.inc
+
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 9999999 Expected
+
+SET @@GLOBAL.sort_buffer_size=DEFAULT;
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 262144 Expected
+
+--echo '#---------------------WL6372_VAR_8_03----------------------#'
+####################################################################
+#   Checking Value can be set - Dynamic                            #
+####################################################################
+
+SET @@local.sort_buffer_size=9999999;
+
+SET @@session.sort_buffer_size=9999999;
+
+SET @@GLOBAL.sort_buffer_size=9999999;
+
+SET @@local.sort_buffer_size=DEFAULT;
+
+SET @@session.sort_buffer_size=DEFAULT;
+
+SET @@GLOBAL.sort_buffer_size=DEFAULT;
+
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 262144 Expected
+
+# The below check is hashed until the BUG#14635304 is fixed
+#SELECT @@SESSION.sort_buffer_size;
+#--echo 262144 Expected
+
+#SELECT @@LOCAL.sort_buffer_size;
+#--echo 262144 Expected
+
+--echo '#---------------------WL6372_VAR_8_04----------------------#'
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+SELECT @@GLOBAL.sort_buffer_size = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='sort_buffer_size';
+--echo 1 Expected
+
+SELECT @@session.sort_buffer_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='sort_buffer_size';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.sort_buffer_size);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='sort_buffer_size';
+--echo 1 Expected
+
+
+
+--echo '#---------------------WL6372_VAR_8_05----------------------#'
+################################################################################
+#  Checking Variable Scope                                                     #
+################################################################################
+SELECT @@sort_buffer_size = @@GLOBAL.sort_buffer_size;
+--echo 0 Expected
+
+SELECT COUNT(@@sort_buffer_size);
+--echo 1 Expected
+
+SELECT COUNT(@@local.sort_buffer_size);
+--echo 1 Expected
+
+SELECT COUNT(@@SESSION.sort_buffer_size);
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.sort_buffer_size);
+--echo 1 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT sort_buffer_size = @@SESSION.sort_buffer_size;
+--echo Expected error 'Unknown column sort_buffer_size in field list'
+
+--echo '#---------------------WL6372_VAR_8_06----------------------#'
+################################################################################
+#  Checking boundary values                                                    #
+################################################################################
+--disable_warnings
+SET @@GLOBAL.sort_buffer_size=32767;
+SET @@session.sort_buffer_size=32767;
+--enable_warnings
+
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 32768 Expected
+select @@session.sort_buffer_size;
+--echo 32768 Expected
+
+--disable_warnings
+SET @@global.sort_buffer_size=-1;
+SET @@session.sort_buffer_size=-1;
+--enable_warnings
+
+select @@session.sort_buffer_size;
+--echo 32768 Expected
+SELECT @@GLOBAL.sort_buffer_size;
+--echo 32768 Expected
+################################################################################
+#  The MAX value is not being tested as would                                  #
+# differ on a 32 bit machine and a 64 bit machine                              #
+################################################################################
+
+
+--echo '#---------------------WL6372_VAR_8_07----------------------#'
+################################################################################
+#  Checking the /Var  directory size                                           #
+################################################################################
+-- source include/vardir_size_check.inc
+--echo TRUE Expected
+
+--echo '#---------------------WL6372_VAR_8_08----------------------#'
+################################################################################
+#  Checking the sort buffer functionality when data is more than 32K           #
+################################################################################
+
+--echo # create a table
+let $table = tab1;
+--source include/create_table.inc
+
+--echo #insert some 10 records 
+let $i = 10;
+--source include/Load_data.inc
+
+flush status;
+flush table;
+SET @@GLOBAL.sort_buffer_size=32768;
+SET @@SESSION.sort_buffer_size=32768;
+
+select variable_value from information_schema.session_status where variable_name ='Sort_merge_passes';
+--echo 0 Expected
+select variable_value from information_schema.session_status where variable_name ='Sort_rows';
+--echo 0 Expected
+select variable_value from information_schema.session_status where variable_name ='Sort_scan';
+--echo 0 Expected
+
+set @Sort_merge_passes = (select variable_value from information_schema.session_status where variable_name ='Sort_merge_passes');
+set @Sort_rows = (select variable_value from information_schema.session_status where variable_name ='Sort_rows');
+set @Sort_scan = (select variable_value from information_schema.session_status where variable_name ='Sort_scan');
+
+
+select count(1) from (select b.* from tab1 b inner join tab1 c inner join tab1 d inner join tab1 e inner join tab1 f order by 1) a;
+--echo 100000 Expected
+
+select ( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 537;
+--echo 1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 100000;
+--echo 1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 1;
+--echo 1 Expected
+
+select count(1) from (select b.* from tab1 b inner join tab1 c inner join tab1 d inner join tab1 e inner join tab1 f order by 1) a;
+--echo 100000 Expected
+
+select ( select variable_value from information_schema.global_status where variable_name ='Sort_merge_passes') = @Sort_merge_passes + 1074;
+--echo 1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_rows') = @Sort_rows + 200000;
+--echo 1 Expected
+select (select variable_value from information_schema.global_status where variable_name ='Sort_scan') = @Sort_scan + 2;
+--echo 1 Expected
+
+
+--echo #cleanup
+DROP TABLE IF EXISTS tab1;
+SET @@session.sort_buffer_size=DEFAULT;
+SET @@GLOBAL.sort_buffer_size=DEFAULT;

=== added file 'mysql-test/t/table_definition_cache_functionality.test'
--- a/mysql-test/t/table_definition_cache_functionality.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/table_definition_cache_functionality.test	2012-10-22 13:43:09 +0000
@@ -0,0 +1,207 @@
+###############################################################################
+#                                                                             #
+# Variable Name: table_definition_cache                                       #
+# Scope: Global                                                               #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2012-08-31                                                   #
+# Author : Tanjot Singh Uppal                                                 #
+#                                                                             #
+#                                                                             #
+# Description:Test Cases of Dynamic System Variable table_definition_cache    #
+#             that checks the behavior of this variable in the following ways #
+#              * Value Check                                                  #
+#              * Scope Check                                                  #
+#              * Functionality Check                                          #
+#              * Accessability Check                                          #
+#                                                                             #               
+# This test does not perform the crash recovery on this variable              # 
+# For crash recovery test on default change please run the ibtest             #
+###############################################################################
+
+-- source include/have_innodb.inc
+-- source include/not_embedded.inc
+-- source include/have_innodb_16k.inc
+
+echo '#________________________VAR_05_table_definition_cache__________________#'
+echo '##'
+--echo '#---------------------WL6372_VAR_5_01----------------------#'
+####################################################################
+#   Checking default value                                         #
+####################################################################
+SELECT COUNT(@@GLOBAL.table_definition_cache);
+--echo 1 Expected
+
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+SELECT @@GLOBAL.table_definition_cache;
+--echo 1400 Expected
+
+
+--echo '#---------------------WL6372_VAR_5_02----------------------#'
+#################################################################################
+# Checking the Default value post starting the server with other value          #
+#################################################################################
+--echo # Restart server with table_definition_cache 1
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+-- exec echo "restart:--table_definition_cache=2000  " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- enable_reconnect
+-- source include/wait_until_connected_again.inc
+
+SELECT @@GLOBAL.table_definition_cache;
+--echo 2000 Expected
+
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+SELECT @@GLOBAL.table_definition_cache;
+--echo 1400 Expected
+
+
+--echo '#---------------------WL6372_VAR_5_03----------------------#'
+####################################################################
+#   Checking Value can be set - Dynamic                            #
+####################################################################
+
+--error ER_GLOBAL_VARIABLE
+SET @@local.table_definition_cache=1;
+--echo Expected error 'Global variable'
+
+--error ER_GLOBAL_VARIABLE
+SET @@session.table_definition_cache=1;
+--echo Expected error 'Global variable'
+
+--disable_warnings
+SET @@GLOBAL.table_definition_cache=1;
+--enable_warnings
+
+SET @@GLOBAL.table_definition_cache=DEFAULT;
+
+
+SELECT @@GLOBAL.table_definition_cache;
+--echo 1400 Expected
+
+--echo '#---------------------WL6372_VAR_5_04----------------------#'
+#################################################################
+# Check if the value in GLOBAL Table matches value in variable  #
+#################################################################
+SELECT @@GLOBAL.table_definition_cache = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='table_definition_cache';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.table_definition_cache);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='table_definition_cache';
+--echo 1 Expected
+
+
+
+--echo '#---------------------WL6372_VAR_5_05----------------------#'
+################################################################################
+#  Checking Variable Scope                                                     #
+################################################################################
+SELECT @@table_definition_cache = @@GLOBAL.table_definition_cache;
+--echo 1 Expected
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@local.table_definition_cache);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.table_definition_cache);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT COUNT(@@GLOBAL.table_definition_cache);
+--echo 1 Expected
+
+--Error ER_BAD_FIELD_ERROR
+SELECT table_definition_cache = @@SESSION.table_definition_cache;
+--echo Expected error 'Unknown column table_definition_cache in field list'
+
+
+
+--echo '#---------------------WL6372_VAR_5_06----------------------#'
+###############################################################################
+# Checking the /Var  directory size                                           #
+###############################################################################
+-- source include/vardir_size_check.inc
+--echo TRUE Expected
+
+--echo '#---------------------WL6372_VAR_5_07----------------------#'
+#################################################################################
+# Checking the size of table definition cache functionality                     #
+#################################################################################
+flush tables;
+flush status;
+
+set @Open_table_definitions = (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions');
+set @Opened_table_definitions = (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions');
+
+--echo # create 2 tables 
+
+--disable_warnings
+DROP TABLE IF EXISTS tab1;
+DROP TABLE IF EXISTS tab2;
+--enable_warnings
+
+let $table = tab1;
+--source include/create_table.inc
+
+let $table = tab2;
+--source include/create_table.inc
+
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 2;
+--echo 1 Expected
+
+--echo # open two tables
+
+select 1 from tab1;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 3;
+--echo 1 Expected
+
+select 1 from tab2;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 2;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+--echo 1 Expected
+
+DROP TABLE IF EXISTS tab1;
+
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions + 1;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+--echo 1 Expected
+
+
+DROP TABLE IF EXISTS tab2;
+
+select (select variable_value from information_schema.session_status where variable_name ='Open_table_definitions') = @Open_table_definitions;
+--echo 1 Expected
+
+select (select variable_value from information_schema.session_status where variable_name ='Opened_table_definitions') = @Opened_table_definitions + 4;
+--echo 1 Expected
+
+
+
+
+--echo #cleanup
+set @@GLOBAL.table_definition_cache=DEFAULT;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (tanjot.uppal:4464 to 4465) Tanjot Uppal23 Oct