List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 7 2011 7:36pm
Subject:bzr push into mysql-trunk branch (marc.alff:3245 to 3246)
View as plain text  
 3246 Marc Alff	2011-07-07
      Post merge cleanup, unit tests

    modified:
      storage/perfschema/unittest/pfs-t.cc
 3245 Marc Alff	2011-07-07 [merge]
      Local merge

    removed:
      storage/ndb/test/sql/
      storage/ndb/test/sql/BANK.sql
      storage/ndb/test/sql/T1.sql
      storage/ndb/test/sql/test_create_drop.pl
      storage/ndb/test/sql/test_range_bounds.pl
    added:
      mysql-test/include/explain_non_select.inc
      mysql-test/include/explain_utils.inc
      mysql-test/r/grant_explain_non_select.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/secure_file_priv_win.result
      mysql-test/t/grant_explain_non_select.test
      mysql-test/t/innodb_explain_non_select_all.test
      mysql-test/t/innodb_explain_non_select_none.test
      mysql-test/t/myisam_explain_non_select_all.test
      mysql-test/t/myisam_explain_non_select_none.test
      mysql-test/t/secure_file_priv_win-master.opt
      mysql-test/t/secure_file_priv_win.test
      sql/opt_explain.cc
      sql/opt_explain.h
    modified:
      client/mysqltest.cc
      dbug/dbug.c
      include/mysql/plugin_audit.h
      libmysqld/lib_sql.cc
      mysql-test/include/subquery.inc
      mysql-test/r/alter_table.result
      mysql-test/r/ctype_utf16.result
      mysql-test/r/explain.result
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/sp-security.result
      mysql-test/r/sp.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_jcl6.result
      mysql-test/r/xml.result
      mysql-test/suite/federated/federated.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/t/alter_table.test
      mysql-test/t/ctype_utf16.test
      mysql-test/t/explain.test
      mysql-test/t/greedy_optimizer.test
      mysql-test/t/partition_pruning.test
      mysql-test/t/plugin_auth.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp.test
      mysql-test/t/xml.test
      mysys/my_symlink.c
      plugin/audit_null/audit_null.c
      sql/CMakeLists.txt
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_xmlfunc.cc
      sql/my_decimal.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/opt_range.h
      sql/protocol.cc
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_class.h
      sql/sql_delete.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_priv.h
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_update.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      storage/innobase/btr/btr0cur.c
      storage/perfschema/pfs.cc
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/gunit/my_decimal-t.cc
      unittest/mysys/lf-t.c
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2011-07-07 19:35:07 +0000
@@ -1003,6 +1003,7 @@ void test_locker_disabled()
   rwlock_class_A->m_enabled= true;
   cond_class_A->m_enabled= true;
   file_class_A->m_enabled= true;
+  update_instruments_derived_flags();
 
   mutex_locker= psi->get_thread_mutex_locker(&mutex_state, mutex_A1, PSI_MUTEX_LOCK);
   ok(mutex_locker == NULL, "no locker (global disabled)");
@@ -1017,7 +1018,7 @@ void test_locker_disabled()
   file_locker= psi->get_thread_file_descriptor_locker(&file_state, (File) 12, PSI_FILE_READ);
   ok(file_locker == NULL, "no locker (global disabled)");
 
-  /* Pretent the mode is global, counted only */
+  /* Pretend the mode is global, counted only */
   /* ---------------------------------------- */
 
   setup_thread(thread_1, true);
@@ -1031,6 +1032,7 @@ void test_locker_disabled()
   cond_class_A->m_timed= false;
   file_class_A->m_enabled= true;
   file_class_A->m_timed= false;
+  update_instruments_derived_flags();
 
   mutex_locker= psi->get_thread_mutex_locker(&mutex_state, mutex_A1, PSI_MUTEX_LOCK);
   ok(mutex_locker == NULL, "no locker (global counted)");
@@ -1063,6 +1065,7 @@ void test_locker_disabled()
   rwlock_class_A->m_enabled= false;
   cond_class_A->m_enabled= false;
   file_class_A->m_enabled= false;
+  update_instruments_derived_flags();
 
   mutex_locker= psi->get_thread_mutex_locker(&mutex_state, mutex_A1, PSI_MUTEX_LOCK);
   ok(mutex_locker == NULL, "no locker");
@@ -1092,6 +1095,7 @@ void test_locker_disabled()
   cond_class_A->m_timed= true;
   file_class_A->m_enabled= true;
   file_class_A->m_timed= true;
+  update_instruments_derived_flags();
 
   mutex_locker= psi->get_thread_mutex_locker(&mutex_state, mutex_A1, PSI_MUTEX_LOCK);
   ok(mutex_locker != NULL, "locker");
@@ -1127,6 +1131,7 @@ void test_locker_disabled()
   rwlock_class_A->m_enabled= true;
   cond_class_A->m_enabled= true;
   file_class_A->m_enabled= true;
+  update_instruments_derived_flags();
 
   mutex_locker= psi->get_thread_mutex_locker(&mutex_state, mutex_A1, PSI_MUTEX_LOCK);
   ok(mutex_locker == NULL, "no locker");

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marc.alff:3245 to 3246) Marc Alff7 Jul