From: Christopher Powers
Date: January 5 2012 6:58pm
Subject: bzr push into mysql-trunk branch (chris.powers:3705 to 3706) Bug#12790483
List-Archive: http://lists.mysql.com/commits/142308
X-Bug: 12790483
Message-Id: <201201051900.q05J05F2028128@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3706 Christopher Powers	2012-01-05
      Bug#12790483 - OBJECTS_SUMMARY_GLOBAL_BY_TYPE AND RENAME TABLE
        
      Fixed build break.

    modified:
      mysys/psi_noop.c
 3705 Christopher Powers	2012-01-05 [merge]
      local merge

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/distinct.result
      mysql-test/r/group_by.result
      mysql-test/r/having.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/join.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_bka.result
      mysql-test/r/join_outer_bka_nixbnl.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/select_all_bka.result
      mysql-test/r/select_all_bka_nixbnl.result
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/temp_table.result
      mysql-test/t/distinct.test
      mysql-test/t/group_by.test
      mysql-test/t/having.test
      mysql-test/t/join.test
      mysql-test/t/join_outer.test
      sql/field.h
      sql/field_conv.cc
      sql/item_sum.cc
      sql/opt_sum.cc
      sql/sql_base.cc
      sql/sql_executor.cc
      sql/sql_lex.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_planner.cc
      sql/sql_select.cc
      sql/sql_tmp_table.cc
      sql/table.cc
      sql/table.h
      storage/myisam/mi_create.c
      unittest/gunit/bounded_queue-t.cc
      unittest/gunit/bounds_checked_array-t.cc
      unittest/gunit/cost_estimate-t.cc
      unittest/gunit/dbug-t.cc
      unittest/gunit/dynarray-t.cc
      unittest/gunit/field-t.cc
      unittest/gunit/filesort_buffer-t.cc
      unittest/gunit/get_diagnostics-t.cc
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/item-t.cc
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/my_regex-t.cc
      unittest/gunit/opt_range-t.cc
      unittest/gunit/opt_trace-t.cc
      unittest/gunit/sql_list-t.cc
      unittest/gunit/sql_plist-t.cc
      unittest/gunit/stdcxx-t.cc
      unittest/gunit/tap_event_listener.cc
      unittest/gunit/test_utils.cc
      unittest/gunit/thread_utils-t.cc
      unittest/gunit/thread_utils.cc
=== modified file 'mysys/psi_noop.c'
--- a/mysys/psi_noop.c	2011-10-11 04:27:52 +0000
+++ b/mysys/psi_noop.c	2012-01-05 18:57:16 +0000
@@ -158,8 +158,9 @@ static void release_table_share_noop(PSI
 }
 
 static void
-drop_table_share_noop(const char *schema_name NNN, int schema_name_length NNN,
-                      const char *table_name NNN, int table_name_length NNN)
+drop_table_share_noop(my_bool temporary NNN, const char *schema_name NNN,
+                      int schema_name_length NNN, const char *table_name NNN,
+                      int table_name_length NNN)
 {
   return;
 }

No bundle (reason: useless for push emails).