From: Marc Alff Date: November 8 2011 10:49pm Subject: bzr push into mysql-trunk-marc branch (marc.alff:3568 to 3569) List-Archive: http://lists.mysql.com/commits/141867 Message-Id: <201111082249.pA8MnKYs031686@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3569 Marc Alff 2011-11-08 [merge] Merge mysql-trunk --> mysql-trunk-marc modified: sql/opt_trace.h sql/opt_trace2server.cc sql/sql_show.cc 3568 Marc Alff 2011-11-08 [merge] Merge mysql-trunk --> mysql-trunk-marc removed: mysql-test/suite/binlog/r/binlog_truncate_innodb.result mysql-test/suite/binlog/t/binlog_truncate_innodb.test added: unittest/gunit/filesort_buffer-t.cc modified: configure.cmake mysql-test/r/filesort_debug.result mysql-test/suite/binlog/t/disabled.def mysql-test/suite/opt_trace/include/general.inc mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/include/subquery.inc mysql-test/suite/opt_trace/r/filesort_pq.result 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/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/t/disabled.def mysql-test/t/filesort_debug.test mysql-test/valgrind.supp scripts/mysql_config.pl.in scripts/mysql_config.sh sql/filesort.cc sql/filesort_utils.cc sql/filesort_utils.h sql/mdl.cc sql/table.h storage/innobase/btr/btr0pcur.c storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0pcur.h storage/innobase/include/btr0pcur.ic unittest/gunit/CMakeLists.txt === modified file 'sql/opt_trace.h' --- a/sql/opt_trace.h 2011-10-28 12:45:35 +0000 +++ b/sql/opt_trace.h 2011-11-08 19:52:19 +0000 @@ -1120,14 +1120,6 @@ void opt_trace_disable_if_no_stored_proc */ int fill_optimizer_trace_info(THD *thd, TABLE_LIST *tables, Item *cond); -/** - Create fields' descriptions of information_schema.OPTIMIZER_TRACE - @retval 0 ok - @retval 1 out of memory -*/ -int make_optimizer_trace_table_for_show(THD *thd, - st_schema_table *schema_table); - //@} #else /* defined (OPTIMIZER_TRACE) */ === modified file 'sql/opt_trace2server.cc' --- a/sql/opt_trace2server.cc 2011-10-05 13:16:38 +0000 +++ b/sql/opt_trace2server.cc 2011-11-08 19:52:19 +0000 @@ -500,7 +500,6 @@ void opt_trace_disable_if_no_tables_acce int fill_optimizer_trace_info(THD *thd, TABLE_LIST *tables, Item *cond) { -#ifdef OPTIMIZER_TRACE TABLE *table= tables->table; Opt_trace_info info; @@ -556,13 +555,9 @@ int fill_optimizer_trace_info(THD *thd, } return 0; -#else - my_error(ER_FEATURE_DISABLED, MYF(0), "optimizer trace", - "-DOPTIMIZER_TRACE=1"); - return 1; -#endif } +#endif // OPTIMIZER_TRACE ST_FIELD_INFO optimizer_trace_info[]= { @@ -577,30 +572,6 @@ ST_FIELD_INFO optimizer_trace_info[]= }; -int make_optimizer_trace_table_for_show(THD *thd, - ST_SCHEMA_TABLE *schema_table) -{ - Name_resolution_context *context= &thd->lex->select_lex.context; - - for (int i= 0; schema_table->fields_info[i].field_name != NULL; i++) - { - ST_FIELD_INFO *field_info= &schema_table->fields_info[i]; - Item_field *field= new Item_field(context, - NullS, NullS, field_info->field_name); - if (field) - { - field->set_name(field_info->old_name, - static_cast(strlen(field_info->old_name)), - system_charset_info); - if (add_item_to_list(thd, field)) - return 1; - } - else - return 1; - } - return 0; -} - /* LiteralsWithIntroducers : @@ -630,5 +601,3 @@ int make_optimizer_trace_table_for_show( there would be no problem ('0', 'x', 'E', and 'D' are identical in latin1 and utf8: they would be preserved during conversion). */ - -#endif // OPTIMIZER_TRACE === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2011-10-13 07:26:28 +0000 +++ b/sql/sql_show.cc 2011-11-08 19:52:19 +0000 @@ -7840,10 +7840,8 @@ ST_FIELD_INFO tablespaces_fields_info[]= }; -#ifdef OPTIMIZER_TRACE /** For creating fields of information_schema.OPTIMIZER_TRACE */ extern ST_FIELD_INFO optimizer_trace_info[]; -#endif /* Description of ST_FIELD_INFO in table.h @@ -7870,7 +7868,7 @@ ST_SCHEMA_TABLE schema_tables[]= #ifdef HAVE_EVENT_SCHEDULER {"EVENTS", events_fields_info, create_schema_table, Events::fill_schema_events, make_old_format, 0, -1, -1, 0, 0}, -#else +#else // for alignment with enum_schema_tables {"EVENTS", events_fields_info, create_schema_table, 0, make_old_format, 0, -1, -1, 0, 0}, #endif @@ -7887,8 +7885,10 @@ ST_SCHEMA_TABLE schema_tables[]= fill_open_tables, make_old_format, 0, -1, -1, 1, 0}, #ifdef OPTIMIZER_TRACE {"OPTIMIZER_TRACE", optimizer_trace_info, create_schema_table, - fill_optimizer_trace_info, make_optimizer_trace_table_for_show, - NULL, -1, -1, false, 0}, + fill_optimizer_trace_info, NULL, NULL, -1, -1, false, 0}, +#else // for alignment with enum_schema_tables + {"OPTIMIZER_TRACE", optimizer_trace_info, create_schema_table, + NULL, NULL, NULL, -1, -1, false, 0}, #endif {"PARAMETERS", parameters_fields_info, create_schema_table, fill_schema_proc, 0, 0, -1, -1, 0, 0}, No bundle (reason: useless for push emails).