List:Commits« Previous MessageNext Message »
From:marko.makela Date:April 16 2012 3:14pm
Subject:bzr push into mysql-trunk-wl5545 branch (marko.makela:3887 to 3889)
View as plain text  
 3889 Marko Mäkelä	2012-04-16 [merge]
      Merge mysql-trunk to mysql-trunk-wl5545.

    added:
      mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
      mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
    modified:
      libmysqld/lib_sql.cc
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/include/function_defaults.inc
      mysql-test/r/alter_table.result
      mysql-test/r/explain.result
      mysql-test/r/function_defaults.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/help.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_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/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/show_check.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/sp-threads.result
      mysql-test/r/type_time.result
      mysql-test/r/variables.result
      mysql-test/suite/binlog/r/binlog_rewrite.result
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_val_ps.result
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      mysql-test/suite/parts/r/partition_exch_qa_12.result
      mysql-test/suite/parts/t/partition_exch_qa_12.test
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_mts_debug.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_row_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      mysql-test/t/alter_table.test
      mysql-test/t/help.test
      mysql-test/t/partition_exchange.test
      mysql-test/t/show_check.test
      mysql-test/t/sp-threads.test
      sql/binlog.cc
      sql/event_scheduler.cc
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/global_threads.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_func.cc
      sql/item_func.h
      sql/item_timefunc.h
      sql/item_xmlfunc.cc
      sql/lex.h
      sql/log.h
      sql/log_event.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_info_dummy.cc
      sql/rpl_info_dummy.h
      sql/rpl_info_factory.cc
      sql/rpl_info_factory.h
      sql/rpl_info_file.cc
      sql/rpl_info_file.h
      sql/rpl_info_handler.h
      sql/rpl_info_table.cc
      sql/rpl_info_table.h
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/scheduler.cc
      sql/share/errmsg-utf8.txt
      sql/signal_handler.cc
      sql/sp_head.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_executor.cc
      sql/sql_insert.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_partition_admin.cc
      sql/sql_plugin.cc
      sql/sql_reload.cc
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/sys_vars.cc
      storage/example/ha_example.cc
      storage/innobase/fts/fts0blex.cc
      storage/innobase/fts/fts0blex.l
      storage/innobase/fts/fts0que.cc
      storage/innobase/fts/fts0tlex.cc
      storage/innobase/fts/fts0tlex.l
      storage/myisam/ha_myisam.cc
      storage/ndb/compile-cluster
      storage/perfschema/pfs_check.cc
      unittest/gunit/alignment-t.cc
      unittest/gunit/fake_table.h
      unittest/gunit/field-t.cc
      unittest/gunit/field_timestamp-t.cc
 3888 Marko Mäkelä	2012-04-16
      WL#5545 column renaming: Properly rename columns when creating a new
      clustered index. Prohibit renaming conflicts with the internal column
      name FTS_DOC_ID.
      
      innobase_create_index_field_def(): Add the parameter altered_table for
      resolving the column names when creating a new clustered index.
      
      innobase_create_index_def(), innobase_create_key_defs(): Add the
      parameter altered_table.
      
      innobase_fts_check_doc_id_col(): Add the parameter altered_table for
      looking up other column names than internal ones. Do not write
      anything to the standard error output. Issue errors by my_error().
      
      prepare_inplace_alter_table(): Prohibit renaming columns to something
      that already exists in the table.
      
      ha_innobase::commit_inplace_alter_table(): Skip the renaming of
      columns if a clustered index was created.
      
      TODO: Fix the renaming of c1 to c2 and c2 to c1 in one go. It
      currently does not work unless creating a clustered index.

    modified:
      mysql-test/suite/innodb/r/innodb-alter.result
      mysql-test/suite/innodb/t/innodb-alter.test
      sql/field.h
      storage/innobase/handler/handler0alter.cc
 3887 Marko Mäkelä	2012-04-11
      WL#5545 review cleanup: refactor column renaming.
      
      dict_mem_table_col_rename_low(), dict_mem_table_col_rename(): Refactored from
      innobase_rename_column().

    modified:
      storage/innobase/dict/dict0mem.cc
      storage/innobase/handler/handler0alter.cc
      storage/innobase/include/dict0mem.h

Diff too large for email (16945 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5545 branch (marko.makela:3887 to 3889) marko.makela20 Apr