bzr push into mysql-trunk branch (tanjot.uppal:4483 to 4484)

[Tanjot Uppal]

 4484 Tanjot Uppal	2012-10-05
      Table_open_cache_functionality_test patch

    modified:
      mysql-test/r/table_open_cache_functionality.result
      mysql-test/t/table_open_cache_functionality.test
 4483 Mayank Prasad	2012-10-05
      WL#6372 : Post-Iris changes to Server defaults
                                                
      Details: 
       - Fixing PB2 unittest failures.

    modified:
      unittest/gunit/test_utils.cc
      unittest/gunit/test_utils.h
=== modified file 'mysql-test/r/table_open_cache_functionality.result'
--- a/mysql-test/r/table_open_cache_functionality.result	2012-10-05 06:28:59 +0000
+++ b/mysql-test/r/table_open_cache_functionality.result	2012-10-05 11:13:25 +0000
@@ -126,19 +126,6 @@ set @opened_tables = (select variable_va
 set @open_cache_hits = (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits');
 set @open_cache_miss = (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses');
 set @open_cache_overflow = (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows');
-# Phase 1
-select @opened_tables;
-@opened_tables
-2
-select @open_cache_hits;
-@open_cache_hits
-0
-select @open_cache_miss;
-@open_cache_miss
-2
-select @open_cache_overflow;
-@open_cache_overflow
-0
 # table_open_cache hit 1
 select 1 from tab1;
 1
@@ -148,19 +135,6 @@ select 1 from tab1;
 select 1 from tab2;
 1
 1 Expected
-# Phase 2
-select variable_value from information_schema.session_status where variable_name ='Opened_tables';
-variable_value
-2
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits';
-variable_value
-2
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses';
-variable_value
-2
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows';
-variable_value
-0
 select (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables;
 (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables
 1
@@ -181,19 +155,6 @@ select (select variable_value from infor
 select 1 from tab3;
 1
 1 Expected
-Phase 3
-select variable_value from information_schema.session_status where variable_name ='Opened_tables';
-variable_value
-3
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits';
-variable_value
-2
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses';
-variable_value
-3
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows';
-variable_value
-1
 select (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables + 1;
 (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables + 1
 1

=== modified file 'mysql-test/t/table_open_cache_functionality.test'
--- a/mysql-test/t/table_open_cache_functionality.test	2012-10-05 06:28:59 +0000
+++ b/mysql-test/t/table_open_cache_functionality.test	2012-10-05 11:13:25 +0000
@@ -25,6 +25,13 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb_16k.inc
 
+if (`select $PS_PROTOCOL != 0`)
+{
+   --skip Test requires: ps-protocol disabled
+}
+
+
+
 echo '#________________________VAR_05_table_open_cache__________________#'
 echo '##'
 --echo '#---------------------WL6372_VAR_5_01----------------------#'
@@ -170,13 +177,6 @@ set @open_cache_hits = (select variable_
 set @open_cache_miss = (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses');
 set @open_cache_overflow = (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows');
 
---echo # Phase 1
-
-select @opened_tables;
-select @open_cache_hits;
-select @open_cache_miss;
-select @open_cache_overflow;
-
 --echo # table_open_cache hit 1
 select 1 from tab1;
 --echo 1 Expected
@@ -185,13 +185,6 @@ select 1 from tab1;
 select 1 from tab2;
 --echo 1 Expected
 
---echo # Phase 2
-select variable_value from information_schema.session_status where variable_name ='Opened_tables';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows';
-
-
 select (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables;
 --echo 1 Expected
 select (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits') = @open_cache_hits + 2;
@@ -205,13 +198,6 @@ select (select variable_value from infor
 select 1 from tab3;
 --echo 1 Expected
 
---echo Phase 3
-select variable_value from information_schema.session_status where variable_name ='Opened_tables';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_misses';
-select variable_value from information_schema.session_status where variable_name ='Table_open_cache_overflows';
-
-
 select (select variable_value from information_schema.session_status where variable_name ='Opened_tables') = @opened_tables + 1;
 --echo 1 Expected
 select (select variable_value from information_schema.session_status where variable_name ='Table_open_cache_hits') = @open_cache_hits + 2;

No bundle (reason: useless for push emails).