3466 Alfranio Correia 2010-12-21 [merge]
merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
modified:
sql/rpl_info.cc
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/rpl_rli.h
3465 Anitha Gopi 2010-12-21 [merge]
BUG #59055: Up merge revision 3225 from mysql-5.5-bugteam
modified:
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_2/t/disabled.def
mysql-test/suite/parts/t/disabled.def
3464 Tor Didriksen 2010-12-21 [merge]
automerge 5.5-bugteam => trunk-bugfixing
modified:
cmake/os/SunOS.cmake
config.h.cmake
configure.cmake
include/my_pthread.h
include/mysql/psi/mysql_file.h
mysys/ptr_cmp.c
sql/my_decimal.cc
sql/mysqld.cc
sql/sql_audit.h
sql/sql_plugin.h
sql/sql_show.cc
sql/sys_vars.h
storage/perfschema/pfs_instr.cc
3463 Sergey Glukhov 2010-12-21 [merge]
automerge
3462 Sergey Glukhov 2010-12-21 [merge]
automerge
modified:
mysql-test/include/rpl_start_server.inc
mysql-test/include/rpl_stop_server.inc
mysql-test/suite/rpl/r/rpl_do_grant.result
mysql-test/suite/rpl/t/rpl_do_grant.test
sql/protocol.cc
3461 Sergey Glukhov 2010-12-21 [merge]
5.5-bugteam->trunk-bugfixing merge
@ mysql-test/r/func_group.result
5.5-bugteam->trunk-bugfixing merge
@ mysql-test/t/func_group.test
5.5-bugteam->trunk-bugfixing merge
modified:
mysql-test/r/func_group.result
mysql-test/t/func_group.test
3460 Sergey Glukhov 2010-12-21 [merge]
5.5-bugteam->trunk-bugfixing merge
@ mysql-test/r/func_group.result
5.5-bugteam->trunk-bugfixing merge
@ mysql-test/t/func_group.test
5.5-bugteam->trunk-bugfixing merge
@ sql/item.cc
5.5-bugteam->trunk-bugfixing merge
@ sql/item_sum.cc
5.5-bugteam->trunk-bugfixing merge
@ sql/item_sum.h
5.5-bugteam->trunk-bugfixing merge
modified:
mysql-test/r/func_group.result
mysql-test/t/func_group.test
sql/item.cc
sql/item_sum.cc
sql/item_sum.h
3459 Andrei Elkin 2010-12-21 [merge]
merge from mysql-trunk-bugfixing repo to local branch with bug fixes
modified:
mysql-test/extra/rpl_tests/rpl_auto_increment.test
mysql-test/suite/rpl/r/rpl_auto_increment.result
sql/log_event.cc
sql/log_event.h
sql/rpl_record.cc
sql/rpl_record.h
3458 Andrei Elkin 2010-12-21 [merge]
Bug #58753 rpl_checksum finds unsuppressed warning
Fixed with deploying a suppression in the test.
The test provokes the warning by a failure simulation.
This patch cleans up rpl_checksum as well.
modified:
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/t/rpl_checksum.test
3457 Sven Sandberg 2010-12-21 [merge]
null-merge. no files changed
3456 Alexander Nozdrin 2010-12-21
Fix tree name.
modified:
.bzr-mysql/default.conf
3455 Alexander Nozdrin 2010-12-21 [merge]
Auto-merge from mysql-trunk-innodb.
modified:
storage/innobase/buf/buf0buf.c
storage/innobase/handler/i_s.cc
3454 Anitha Gopi 2010-12-21 [merge]
Bug #59055: Up merge 3217 from mysql-5.5-bugteam. Also some additional changes to the collections specific to mysql-truk
removed:
mysql-test/r/ctype_utf8mb4_ndb.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_columns_ndb.result
mysql-test/suite/funcs_1/r/is_engines_ndb.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/ndb_bitdata.result
mysql-test/suite/funcs_1/r/ndb_cursors.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result
mysql-test/suite/funcs_1/r/ndb_storedproc_03.result
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result
mysql-test/suite/funcs_1/r/ndb_trig_0102.result
mysql-test/suite/funcs_1/r/ndb_trig_03.result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
mysql-test/suite/funcs_1/r/ndb_trig_0407.result
mysql-test/suite/funcs_1/r/ndb_trig_08.result
mysql-test/suite/funcs_1/r/ndb_trig_09.result
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
mysql-test/suite/funcs_1/r/ndb_views.result
mysql-test/suite/funcs_1/t/is_cml_ndb.test
mysql-test/suite/funcs_1/t/is_columns_ndb.test
mysql-test/suite/funcs_1/t/is_engines_ndb.test
mysql-test/suite/funcs_1/t/is_tables_ndb.test
mysql-test/suite/funcs_1/t/ndb_bitdata.test
mysql-test/suite/funcs_1/t/ndb_cursors.test
mysql-test/suite/funcs_1/t/ndb_func_view.test
mysql-test/suite/funcs_1/t/ndb_storedproc_02.test
mysql-test/suite/funcs_1/t/ndb_storedproc_03.test
mysql-test/suite/funcs_1/t/ndb_storedproc_06.test
mysql-test/suite/funcs_1/t/ndb_storedproc_07.test
mysql-test/suite/funcs_1/t/ndb_storedproc_08.test
mysql-test/suite/funcs_1/t/ndb_storedproc_10.test
mysql-test/suite/funcs_1/t/ndb_trig_0102.test
mysql-test/suite/funcs_1/t/ndb_trig_03.test
mysql-test/suite/funcs_1/t/ndb_trig_03e.test
mysql-test/suite/funcs_1/t/ndb_trig_0407.test
mysql-test/suite/funcs_1/t/ndb_trig_08.test
mysql-test/suite/funcs_1/t/ndb_trig_09.test
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
mysql-test/suite/funcs_1/t/ndb_views.test
mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/ndb/
mysql-test/suite/ndb/my.cnf
mysql-test/suite/ndb/r/
mysql-test/suite/ndb/r/loaddata_autocom_ndb.result
mysql-test/suite/ndb/r/ndb_alter_table.result
mysql-test/suite/ndb/r/ndb_alter_table2.result
mysql-test/suite/ndb/r/ndb_alter_table3.result
mysql-test/suite/ndb/r/ndb_auto_increment.result
mysql-test/suite/ndb/r/ndb_autoinc.result
mysql-test/suite/ndb/r/ndb_basic.result
mysql-test/suite/ndb/r/ndb_binlog_basic.result
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
mysql-test/suite/ndb/r/ndb_binlog_discover.result
mysql-test/suite/ndb/r/ndb_binlog_format.result
mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
mysql-test/suite/ndb/r/ndb_binlog_multi.result
mysql-test/suite/ndb/r/ndb_bitfield.result
mysql-test/suite/ndb/r/ndb_blob.result
mysql-test/suite/ndb/r/ndb_blob_partition.result
mysql-test/suite/ndb/r/ndb_bug26793.result
mysql-test/suite/ndb/r/ndb_bug31477.result
mysql-test/suite/ndb/r/ndb_cache.result
mysql-test/suite/ndb/r/ndb_cache2.result
mysql-test/suite/ndb/r/ndb_cache_multi.result
mysql-test/suite/ndb/r/ndb_cache_multi2.result
mysql-test/suite/ndb/r/ndb_charset.result
mysql-test/suite/ndb/r/ndb_condition_pushdown.result
mysql-test/suite/ndb/r/ndb_config.result
mysql-test/suite/ndb/r/ndb_config2.result
mysql-test/suite/ndb/r/ndb_cursor.result
mysql-test/suite/ndb/r/ndb_database.result
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_dd_basic.result
mysql-test/suite/ndb/r/ndb_dd_ddl.result
mysql-test/suite/ndb/r/ndb_dd_disk2memory.result
mysql-test/suite/ndb/r/ndb_dd_dump.result
mysql-test/suite/ndb/r/ndb_dd_sql_features.result
mysql-test/suite/ndb/r/ndb_gis.result
mysql-test/suite/ndb/r/ndb_grant.result
mysql-test/suite/ndb/r/ndb_index.result
mysql-test/suite/ndb/r/ndb_index_ordered.result
mysql-test/suite/ndb/r/ndb_index_unique.result
mysql-test/suite/ndb/r/ndb_insert.result
mysql-test/suite/ndb/r/ndb_limit.result
mysql-test/suite/ndb/r/ndb_load.result
mysql-test/suite/ndb/r/ndb_loaddatalocal.result
mysql-test/suite/ndb/r/ndb_lock.result
mysql-test/suite/ndb/r/ndb_lock_table.result
mysql-test/suite/ndb/r/ndb_minmax.result
mysql-test/suite/ndb/r/ndb_multi.result
mysql-test/suite/ndb/r/ndb_multi_row.result
mysql-test/suite/ndb/r/ndb_partition_error.result
mysql-test/suite/ndb/r/ndb_partition_error2.result
mysql-test/suite/ndb/r/ndb_partition_key.result
mysql-test/suite/ndb/r/ndb_partition_list.result
mysql-test/suite/ndb/r/ndb_partition_range.result
mysql-test/suite/ndb/r/ndb_read_multi_range.result
mysql-test/suite/ndb/r/ndb_rename.result
mysql-test/suite/ndb/r/ndb_replace.result
mysql-test/suite/ndb/r/ndb_restore.result
mysql-test/suite/ndb/r/ndb_restore_compat.result
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result
mysql-test/suite/ndb/r/ndb_restore_partition.result
mysql-test/suite/ndb/r/ndb_restore_print.result
mysql-test/suite/ndb/r/ndb_row_format.result
mysql-test/suite/ndb/r/ndb_single_user.result
mysql-test/suite/ndb/r/ndb_sp.result
mysql-test/suite/ndb/r/ndb_subquery.result
mysql-test/suite/ndb/r/ndb_temporary.result
mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result
mysql-test/suite/ndb/r/ndb_transaction.result
mysql-test/suite/ndb/r/ndb_trigger.result
mysql-test/suite/ndb/r/ndb_truncate.result
mysql-test/suite/ndb/r/ndb_types.result
mysql-test/suite/ndb/r/ndb_update.result
mysql-test/suite/ndb/r/ndb_update_no_read.result
mysql-test/suite/ndb/r/ndb_view.result
mysql-test/suite/ndb/r/ndbapi.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/r/strict_autoinc_5ndb.result
mysql-test/suite/ndb/t/
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test
mysql-test/suite/ndb/t/ndb_alter_table.test
mysql-test/suite/ndb/t/ndb_alter_table2.test
mysql-test/suite/ndb/t/ndb_alter_table3.test
mysql-test/suite/ndb/t/ndb_auto_increment.test
mysql-test/suite/ndb/t/ndb_autoinc.test
mysql-test/suite/ndb/t/ndb_basic.test
mysql-test/suite/ndb/t/ndb_binlog_basic.test
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test
mysql-test/suite/ndb/t/ndb_binlog_discover.test
mysql-test/suite/ndb/t/ndb_binlog_format.test
mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt
mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test
mysql-test/suite/ndb/t/ndb_binlog_multi.test
mysql-test/suite/ndb/t/ndb_bitfield.test
mysql-test/suite/ndb/t/ndb_blob.test
mysql-test/suite/ndb/t/ndb_blob_partition.test
mysql-test/suite/ndb/t/ndb_bug26793.test
mysql-test/suite/ndb/t/ndb_bug31477.test
mysql-test/suite/ndb/t/ndb_cache.test
mysql-test/suite/ndb/t/ndb_cache2.test
mysql-test/suite/ndb/t/ndb_cache_multi.test
mysql-test/suite/ndb/t/ndb_cache_multi2.test
mysql-test/suite/ndb/t/ndb_charset.test
mysql-test/suite/ndb/t/ndb_condition_pushdown.test
mysql-test/suite/ndb/t/ndb_config.test
mysql-test/suite/ndb/t/ndb_config2.test
mysql-test/suite/ndb/t/ndb_cursor.test
mysql-test/suite/ndb/t/ndb_database.test
mysql-test/suite/ndb/t/ndb_dd_alter.test
mysql-test/suite/ndb/t/ndb_dd_basic.test
mysql-test/suite/ndb/t/ndb_dd_ddl.test
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test
mysql-test/suite/ndb/t/ndb_dd_dump.test
mysql-test/suite/ndb/t/ndb_dd_sql_features.test
mysql-test/suite/ndb/t/ndb_gis.test
mysql-test/suite/ndb/t/ndb_grant.later
mysql-test/suite/ndb/t/ndb_index.test
mysql-test/suite/ndb/t/ndb_index_ordered.test
mysql-test/suite/ndb/t/ndb_index_unique.test
mysql-test/suite/ndb/t/ndb_insert.test
mysql-test/suite/ndb/t/ndb_limit.test
mysql-test/suite/ndb/t/ndb_load.test
mysql-test/suite/ndb/t/ndb_loaddatalocal.test
mysql-test/suite/ndb/t/ndb_lock.test
mysql-test/suite/ndb/t/ndb_lock_table.test
mysql-test/suite/ndb/t/ndb_minmax.test
mysql-test/suite/ndb/t/ndb_multi.test
mysql-test/suite/ndb/t/ndb_multi_row.test
mysql-test/suite/ndb/t/ndb_partition_error.test
mysql-test/suite/ndb/t/ndb_partition_error2-master.opt
mysql-test/suite/ndb/t/ndb_partition_error2.test
mysql-test/suite/ndb/t/ndb_partition_key.test
mysql-test/suite/ndb/t/ndb_partition_list.test
mysql-test/suite/ndb/t/ndb_partition_range.test
mysql-test/suite/ndb/t/ndb_read_multi_range.test
mysql-test/suite/ndb/t/ndb_rename.test
mysql-test/suite/ndb/t/ndb_replace.test
mysql-test/suite/ndb/t/ndb_restore.test
mysql-test/suite/ndb/t/ndb_restore_compat.test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test
mysql-test/suite/ndb/t/ndb_restore_partition-master.opt
mysql-test/suite/ndb/t/ndb_restore_partition.test
mysql-test/suite/ndb/t/ndb_restore_print.test
mysql-test/suite/ndb/t/ndb_row_format.test
mysql-test/suite/ndb/t/ndb_single_user.test
mysql-test/suite/ndb/t/ndb_sp.test
mysql-test/suite/ndb/t/ndb_subquery.test
mysql-test/suite/ndb/t/ndb_temporary.test
mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test
mysql-test/suite/ndb/t/ndb_transaction.test
mysql-test/suite/ndb/t/ndb_trigger.test
mysql-test/suite/ndb/t/ndb_truncate.test
mysql-test/suite/ndb/t/ndb_types.test
mysql-test/suite/ndb/t/ndb_update.test
mysql-test/suite/ndb/t/ndb_update_no_read.test
mysql-test/suite/ndb/t/ndb_view.test
mysql-test/suite/ndb/t/ndbapi.test
mysql-test/suite/ndb/t/ps_7ndb.test
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test
mysql-test/suite/ndb_team/
mysql-test/suite/ndb_team/r/
mysql-test/suite/ndb_team/r/ndb_autodiscover.result
mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
mysql-test/suite/ndb_team/r/ndb_backup_print.result
mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb_team/t/
mysql-test/suite/ndb_team/t/disabled.def
mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
mysql-test/suite/ndb_team/t/ndb_backup_print.test
mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
mysql-test/suite/parts/r/ndb_dd_backuprestore.result
mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result
mysql-test/suite/parts/r/partition_alter1_1_ndb.result
mysql-test/suite/parts/r/partition_alter1_2_ndb.result
mysql-test/suite/parts/r/partition_auto_increment_ndb.result
mysql-test/suite/parts/r/partition_engine_ndb.result
mysql-test/suite/parts/r/partition_int_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
mysql-test/suite/parts/r/partition_syntax_ndb.result
mysql-test/suite/parts/r/partition_value_ndb.result
mysql-test/suite/parts/t/ndb_dd_backuprestore.test
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
mysql-test/suite/parts/t/partition_alter1_1_ndb.test
mysql-test/suite/parts/t/partition_alter1_2_ndb.test
mysql-test/suite/parts/t/partition_auto_increment_ndb.test
mysql-test/suite/parts/t/partition_basic_ndb.test
mysql-test/suite/parts/t/partition_engine_ndb.test
mysql-test/suite/parts/t/partition_int_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test
mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt
mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test
mysql-test/suite/parts/t/partition_syntax_ndb.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result
mysql-test/suite/rpl_ndb/
mysql-test/suite/rpl_ndb/combinations
mysql-test/suite/rpl_ndb/my.cnf
mysql-test/suite/rpl_ndb/r/
mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_engines_transactions.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_implicit_commit_binlog.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_row_img.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result
mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb/t/
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_engines_transactions.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.cnf
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_implicit_commit_binlog.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
mysql-test/suite/stress/r/ddl_ndb.result
mysql-test/suite/stress/t/ddl_ndb.test
mysql-test/t/ctype_utf8mb4_ndb.test
modified:
mysql-test/collections/default.experimental
mysql-test/collections/default.weekly
mysql-test/collections/mysql-trunk.daily
mysql-test/collections/mysql-trunk.weekly
mysql-test/t/disabled.def
3453 Bjorn Munch 2010-12-20 [merge]
upmerge some more test if simplifications
modified:
mysql-test/include/check_slave_param.inc
mysql-test/include/diff_tables.inc
mysql-test/include/rpl_change_topology.inc
mysql-test/include/rpl_connect.inc
mysql-test/include/rpl_diff.inc
mysql-test/include/rpl_end.inc
mysql-test/include/rpl_init.inc
mysql-test/include/rpl_row_img_parts_master_slave.inc
mysql-test/include/sync_slave_io_with_master.inc
mysql-test/include/wait_for_binlog_event.inc
mysql-test/include/wait_for_slave_param.inc
mysql-test/include/write_var_to_file.inc
3452 Bjorn Munch 2010-12-20 [merge]
merge test if fixes from trunk-mtr
modified:
.bzr-mysql/default.conf
mysql-test/extra/rpl_tests/rpl_change_master.test
mysql-test/extra/rpl_tests/rpl_crash_safe.inc
mysql-test/include/check_ftwrl_compatible.inc
mysql-test/include/check_ftwrl_incompatible.inc
mysql-test/suite/innodb/t/innodb_bug42419.test
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
3451 Tor Didriksen 2010-12-20 [merge]
Empty merge opt-team => trunk-bugfixing
3450 Tor Didriksen 2010-12-20 [merge]
Merge 5.5-bugteam => trunk-bugfixing
text conflict: include/CMakeLists.txt
modified:
include/CMakeLists.txt
scripts/mysql_config.sh
sql/sql_select.cc
support-files/CMakeLists.txt
3449 Alexander Barkov 2010-12-20
WL#5624 Collation customization improvements
@ include/m_ctype.h
- Extending MY_UCA_MAX_CONTRACTION to 6
- Adding "with_context" indicator
- Adding logical positions
- Introducing new MY_CHARSET_LOADER type, a combination
of error message, memory management functions,
warning reporter routine and collation adding routine.
- Changing parameters to initialization functions to
use MY_CHARSET_LOADER
@ include/my_getopt.h
Moving type definition to my_sys.h, to share in charset related code.
@ include/my_global.h
Adding enum loglevel definition, to share in /strings
@ include/my_sys.h
Moving enum loglevel definition to my_global.h
@ mysql-test/r/ctype_ldml.result
@ mysql-test/std_data/Index.xml
@ mysql-test/t/ctype_ldml.test
Adding tests
@ mysys/charset.c
Adding my_charset_get_by_name() and my_collation_get_by_name() -
extended versions of get_charset_by_name() and get_get_charset_by_csname,
to return error message to the caller.
@ sql/item_strfunc.cc
Using new function mysqld_collation_get_by_name()
@ sql/mysqld.cc
More verbosity at mysqld startup - collation warnings are now displayed.
@ sql/sql_class.h
Adding new function mysqld_collation_get_by_name(),
to get collation and to report error to client on failure.
@ sql/sql_yacc.yy
Using new function mysqld_collation_get_by_name()
@ sql/sys_vars.cc
Using new function mysqld_collation_get_by_name()
@ strings/CMakeLists.txt
Adding coft_to_src to Makefile as an optional binary
(was missed during autotools to cmake transition)
@ strings/conf_to_src.c
Adding "libc" initializer to MY_CHARSET_LOADER.
Changing parameters to use MY_CHARSET_LOADER.
@ strings/ctype-bin.c
Changing parameters to use MY_CHARSET_LOADER.
@ strings/ctype-simple.c
Changing parameters to use MY_CHARSET_LOADER.
@ strings/ctype-uca.c
Adding support for WL#5624 features.
Collation customization parser now works in look-ahead(1) mode.
@ strings/ctype.c
Adding new LDML tags.
modified:
include/m_ctype.h
include/my_getopt.h
include/my_global.h
include/my_sys.h
mysql-test/r/ctype_ldml.result
mysql-test/std_data/Index.xml
mysql-test/t/ctype_ldml.test
mysys/charset.c
sql/item_strfunc.cc
sql/mysqld.cc
sql/sql_class.h
sql/sql_yacc.yy
strings/CMakeLists.txt
strings/conf_to_src.c
strings/ctype-bin.c
strings/ctype-simple.c
strings/ctype-uca.c
strings/ctype.c
Diff too large for email (330793 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3449 to 3466) | Alexander Nozdrin | 22 Dec |
