bzr push into mysql-trunk branch (mayank.prasad:4482 to 4483) WL#6372

[Mayank Prasad]

 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
 4482 Tanjot Uppal	2012-10-05
      table_open_cache_functionality.result
      table_open_cache_functionality.test

    modified:
      mysql-test/r/table_open_cache_functionality.result
      mysql-test/t/table_open_cache_functionality.test
=== modified file 'unittest/gunit/test_utils.cc'
--- a/unittest/gunit/test_utils.cc	revid:tanjot.uppal@stripped
+++ b/unittest/gunit/test_utils.cc	revid:mayank.prasad@stripped
@@ -37,6 +37,8 @@ void setup_server_for_unit_tests()
   char *argv[] = { my_name, 0 };
   set_remaining_args(1, argv);
   mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, MY_MUTEX_INIT_FAST);
+  system_charset_info= &my_charset_utf8_general_ci;
+  sys_var_init();
   init_common_variables();
   my_init_signals();
   randominit(&sql_rand, 0, 0);
@@ -50,6 +52,7 @@ void setup_server_for_unit_tests()
 
 void teardown_server_for_unit_tests()
 {
+  sys_var_end();
   delegates_destroy();
   xid_cache_free();
   gtid_server_cleanup();

=== modified file 'unittest/gunit/test_utils.h'
--- a/unittest/gunit/test_utils.h	revid:tanjot.uppal@stripped
+++ b/unittest/gunit/test_utils.h	revid:mayank.prasad@stripped
@@ -19,6 +19,7 @@
 
 #include "sql_error.h"
 #include "sql_class.h"
+#include "set_var.h"
 
 namespace my_testing {
 

No bundle (reason: useless for push emails).