2718 Andrei Elkin 2008-07-16 [merge]
merging with 6.0-merge-rpl
removed:
mysql-test/r/merge-big.result
mysql-test/t/merge-big.test
sql/backup/debug.h
added:
mysql-test/include/ctype_ascii_order.inc
mysql-test/include/have_debug_sync.inc
mysql-test/r/backup_charsets.result
mysql-test/r/backup_commit_restore.result
mysql-test/r/backup_compression.result
mysql-test/r/backup_lock_myisam.result
mysql-test/r/backup_many_dbs.result
mysql-test/r/backup_multi_blocks.result
mysql-test/r/backup_myisam1.result
mysql-test/r/backup_myisam2.result
mysql-test/r/backup_no_be.result
mysql-test/r/backup_nodata_driver.result
mysql-test/r/backup_procedures.result
mysql-test/r/backup_triggers_and_events.result
mysql-test/r/backup_view_on_view.result
mysql-test/r/backup_views.result
mysql-test/r/ctype_cp866.result
mysql-test/r/debug_sync.result
mysql-test/r/have_debug_sync.require
mysql-test/r/merge-sync.result
mysql-test/r/myisamlog.result
mysql-test/suite/backup/
mysql-test/suite/backup/r/
mysql-test/suite/backup/r/backup_online_testing.result
mysql-test/suite/backup/t/
mysql-test/suite/backup/t/backup_online_testing.test
mysql-test/suite/falcon/r/falcon_bug_37343.result
mysql-test/suite/falcon/r/falcon_bug_37344_A.result
mysql-test/suite/falcon/t/falcon_bug_37343.test
mysql-test/suite/falcon/t/falcon_bug_37344_A.test
mysql-test/t/backup_charsets.test
mysql-test/t/backup_commit_restore.test
mysql-test/t/backup_compression.test
mysql-test/t/backup_lock_myisam.test
mysql-test/t/backup_many_dbs.test
mysql-test/t/backup_multi_blocks.test
mysql-test/t/backup_myisam1-master.opt
mysql-test/t/backup_myisam1.test
mysql-test/t/backup_myisam2.test
mysql-test/t/backup_no_be.test
mysql-test/t/backup_nodata_driver.test
mysql-test/t/backup_procedures.test
mysql-test/t/backup_triggers_and_events.test
mysql-test/t/backup_view_on_view.test
mysql-test/t/backup_views.test
mysql-test/t/ctype_cp866.test
mysql-test/t/debug_sync.test
mysql-test/t/merge-sync.test
mysql-test/t/myisamlog-master.opt
mysql-test/t/myisamlog.test
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/be_logical.h
sql/backup/be_nodata.cc
sql/backup/be_nodata.h
sql/backup/restore_info.h
sql/debug_sync.cc
storage/falcon/CompareAndSwapSparc.il
storage/myisam/mi_examine_log.c
storage/myisam/myisam_backup_engine.cc
renamed:
mysql-test/suite/falcon/r/falcon_bug_28048.result => mysql-test/suite/falcon_team/r/falcon_bug_28048.result
mysql-test/suite/falcon/r/falcon_bug_37080.result => mysql-test/suite/falcon_team/r/falcon_bug_37080.result
mysql-test/suite/falcon/t/falcon_bug_28048.test => mysql-test/suite/falcon_team/t/falcon_bug_28048.test
mysql-test/suite/falcon/t/falcon_bug_37080.test => mysql-test/suite/falcon_team/t/falcon_bug_37080.test
mysql-test/suite/falcon_team/r/falcon_read-committed.result => mysql-test/suite/falcon/r/falcon_read-committed.result
mysql-test/suite/falcon_team/t/falcon_read-committed.test => mysql-test/suite/falcon/t/falcon_read-committed.test
sql/backup/catalog.cc => sql/backup/image_info.cc
sql/backup/catalog.h => sql/backup/image_info.h
modified:
.bzr-mysql/default.conf
.bzrignore
CMakeLists.txt*
client/mysqltest.c
configure.in
dbug/CMakeLists.txt*
include/atomic/generic-msvc.h
include/atomic/nolock.h
include/config-win.h
include/keycache.h
include/my_global.h
include/my_sys.h
include/myisam.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/backup.result
mysql-test/r/backup_commit_blocker.result
mysql-test/r/backup_ddl_blocker.result
mysql-test/r/backup_errors.result
mysql-test/r/backup_objects.result
mysql-test/r/backup_progress.result
mysql-test/r/backup_snapshot.result
mysql-test/r/character_set_server_func.result
mysql-test/r/ctype_big5.result
mysql-test/r/ctype_gb2312.result
mysql-test/r/ctype_gbk.result
mysql-test/r/ctype_tis620.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/fulltext2.result
mysql-test/r/merge.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/falcon/r/falcon_bug_22150.result
mysql-test/suite/falcon/r/falcon_bug_32833.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/t/falcon_bug_22150.test
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_options2.test
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/t/backup.test
mysql-test/t/backup_commit_blocker.test
mysql-test/t/backup_ddl_blocker.test
mysql-test/t/backup_errors.test
mysql-test/t/backup_objects.test
mysql-test/t/backup_progress.test
mysql-test/t/backup_security.test
mysql-test/t/backup_snapshot.test
mysql-test/t/character_set_server_func.test
mysql-test/t/ctype_big5.test
mysql-test/t/ctype_gb2312.test
mysql-test/t/ctype_gbk.test
mysql-test/t/ctype_tis620.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/fulltext2.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/key_cache.test
mysql-test/t/merge.test
mysql-test/t/xml.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/mf_iocache.c
mysys/mf_keycache.c
mysys/my_thr_init.c
mysys/thr_lock.c
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/CMakeLists.txt
sql/backup/Makefile.am
sql/backup/api_types.h
sql/backup/backup_aux.h
sql/backup/backup_engine.h
sql/backup/backup_kernel.h
sql/backup/backup_progress.cc
sql/backup/backup_progress.h
sql/backup/backup_stream.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_default.h
sql/backup/be_native.h
sql/backup/be_snapshot.cc
sql/backup/be_snapshot.h
sql/backup/be_thread.cc
sql/backup/be_thread.h
sql/backup/buffer_iterator.cc
sql/backup/buffer_iterator.h
sql/backup/data_backup.cc
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_services.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_transport.c
sql/ddl_blocker.cc
sql/ddl_blocker.h
sql/handler.cc
sql/item.cc
sql/item_func.cc
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/set_var.cc
sql/set_var.h
sql/share/charsets/cp866.xml
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/sql_array.h
sql/sql_base.cc
sql/sql_bitmap.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_string.cc
sql/sql_table.cc
sql/sql_yacc.yy
storage/falcon/Cache.cpp
storage/falcon/Configuration.cpp
storage/falcon/Connection.cpp
storage/falcon/Gopher.cpp
storage/falcon/Gopher.h
storage/falcon/IO.cpp
storage/falcon/IOx.h
storage/falcon/IndexPage.cpp
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
storage/falcon/Interlock.h
storage/falcon/Makefile.am
storage/falcon/Page.h
storage/falcon/SectorBuffer.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageParameters.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/Transaction.cpp
storage/falcon/WalkDeferred.cpp
storage/falcon/WalkIndex.cpp
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/falcon/plug.in
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_parser.c
storage/myisam/ft_update.c
storage/myisam/ftdefs.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_check.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_page.c
storage/myisam/mi_panic.c
storage/myisam/mi_rrnd.c
storage/myisam/mi_static.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_test_all.sh
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_info.c
storage/myisammrg/myrg_open.c
storage/myisammrg/myrg_queue.c
storage/myisammrg/myrg_rrnd.c
strings/ctype-big5.c
strings/ctype-extra.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
win/configure.js
mysql-test/suite/falcon_team/r/falcon_bug_28048.result
mysql-test/suite/falcon_team/t/falcon_bug_28048.test
mysql-test/suite/falcon_team/t/falcon_bug_37080.test
mysql-test/suite/falcon/r/falcon_read-committed.result
mysql-test/suite/falcon/t/falcon_read-committed.test
sql/backup/image_info.cc
sql/backup/image_info.h
2717 Andrei Elkin 2008-07-16
Bug #25998 problems about circle replication
Bug #27808 Infinite looping in circular replication
In case of withdrawing one of the servers from the circular multi-master replication group
events generated by the removed server could become unstoppable (bug#25998).
That's because the originator had been the terminator of the own event flow.
Other possibility of the unstoppable event is the cluster replication (bug#27808).
In that case an event generated by a member of a cluster was
replicated to another member, got accepted and executed.
By that same time effects of the event had been already propagated
across the cluster via the cluster communications.
In order to avoid double-applying, a replication event generated
by a co-member of the cluster should not be accepted.
Both variations of the unstoppable replication event are fixable with
introducing a new option for CHANGE MASTER:
IGNORE_SERVER_IDS= (sid_1, sid_2, ... )
The option can be set to the empty list that resets.
Fixed with implementing the feature.
Properties of the feature:
a. reporting an error if the id of an ignored server is the slave itself and
its configuration on startup was with --replicate-same-server-id;
b. overriding the existing IGNORE_SERVER_IDS list by the following
CHANGE MASTER ... IGNORE_SERVER_IDS= (list), the empty list arg nullifies
the current ignored list;
c. preserving the existing list by CHANGE MASTER w/o IGNORE_SERVER_IDS;
d. preserving the ignored server ids after RESET SLAVE;
e. extending SHOW SLAVE STATUS with a new line listing ignored servers;
f. a new line in master.info with the list of ignored servers;
g. Differently from --replicate-same-server-id handling, the sql thread is not
concerned with the ignored server ids, because it's supposed that
the relay log consists only of events that can not be unstoppable.
In order to guarantee that, e.g in case of the circular replication with a failing
server DBA needs to change master necessarily using the new option.
h. Rotate and FD events originated by the current master listed
in the ignored list are still relay-logged which does not create
any termination issue.
i. The possible list of ignored servers is sorted for the fastest processing of filtering
algorithm.
Two new lines to show slave status output are added: the list of ignored servers and
the current master server id (yet another feature for the user!).
Use cases for this feature can be found on the bug report page.
modified:
mysql-test/include/master-slave.inc
mysql-test/suite/rpl/r/rpl_000015.result
mysql-test/suite/rpl/r/rpl_bug33931.result
mysql-test/suite/rpl/r/rpl_change_master.result
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
mysql-test/suite/rpl/r/rpl_grant.result
mysql-test/suite/rpl/r/rpl_incident.result
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
mysql-test/suite/rpl/r/rpl_loaddata.result
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
mysql-test/suite/rpl/r/rpl_replicate_do.result
mysql-test/suite/rpl/r/rpl_rotate_logs.result
mysql-test/suite/rpl/r/rpl_row_colSize.result
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
mysql-test/suite/rpl/r/rpl_row_log.result
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
mysql-test/suite/rpl/r/rpl_server_id2.result
mysql-test/suite/rpl/r/rpl_skip_error.result
mysql-test/suite/rpl/r/rpl_slave_skip.result
mysql-test/suite/rpl/r/rpl_ssl1.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
mysql-test/suite/rpl/r/rpl_stm_until.result
mysql-test/suite/rpl/r/rpl_temporary_errors.result
sql/lex.h
sql/rpl_mi.cc
sql/rpl_mi.h
sql/share/errmsg.txt
sql/slave.cc
sql/sql_lex.h
sql/sql_repl.cc
sql/sql_yacc.yy
2716 Alexander Nozdrin 2008-07-14
Disable tests, which fail too often.
modified:
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
2715 Gleb Shchepa 2008-07-14 [merge]
empty merge 5.1-bugteam --> 6.0-bugteam
2714 Mats Kindahl 2008-07-13
Updating result files with mismatch caused by merge from 5.1.
modified:
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
2713 Gleb Shchepa 2008-07-11
minor testcase fix
modified:
mysql-test/r/subselect_debug.result
mysql-test/t/subselect_debug.test
2712 Horst Hunger 2008-07-11 [merge]
merge of fix of Bug#37997 to 6.0.
modified:
mysql-test/r/max_user_connections_func.result
mysql-test/t/max_user_connections_func.test
2711 Gleb Shchepa 2008-07-11
warning elimination
modified:
sql/field.cc
2710 Gleb Shchepa 2008-07-11 [merge]
null-merge 5.1-bugteam --> 6.0-bugteam
2709 Gleb Shchepa 2008-07-11 [merge]
null-merge 5.1-bugteam --> 6.0-bugteam
2708 Gleb Shchepa 2008-07-11
post-merge fix
modified:
mysql-test/r/partition_pruning.result
2707 Gleb Shchepa 2008-07-11 [merge]
merge 6.0-main --> 6.0-bugteam
removed:
dbug/.cvsignore
dbug/doinstall.sh
dbug/install.sh
dbug/mklintlib.sh
dbug/qmake.cmd
dbug/vargs.h
include/atomic/generic-msvc.h
include/lf.h
mysql-test/suite/falcon/r/falcon_bug_22182.result
mysql-test/suite/falcon/r/falcon_bug_26058.result
mysql-test/suite/falcon/r/falcon_bug_32413.result
mysql-test/suite/falcon/r/falcon_ts.result
mysql-test/suite/falcon/t/falcon_bug_22182.test
mysql-test/suite/falcon/t/falcon_bug_26058.test
mysql-test/suite/falcon/t/falcon_bug_32413.test
mysql-test/suite/falcon/t/falcon_ts.test
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
added:
.bzr-mysql.moved/
.bzr-mysql.moved/default.conf
BUILD/compile-amd64-gprof-no-ndb
dbug/remove_function_from_trace.pl
dbug/tests-t.pl
dbug/tests.c
include/atomic/generic-msvc.h
include/lf.h
include/maria.h
include/myisamchk.h
include/wqueue.h
mysql-test/extra/binlog_tests/implicit.test
mysql-test/include/have_maria.inc
mysql-test/include/maria_empty_logs.inc
mysql-test/include/maria_make_snapshot.inc
mysql-test/include/maria_make_snapshot_for_comparison.inc
mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
mysql-test/include/maria_verify_recovery.inc
mysql-test/r/drop-no_root.result
mysql-test/r/information_schema-big.result
mysql-test/r/maria-big.result
mysql-test/r/maria-connect.result
mysql-test/r/maria-gis-rtree-dynamic.result
mysql-test/r/maria-gis-rtree-trans.result
mysql-test/r/maria-gis-rtree.result
mysql-test/r/maria-mvcc.result
mysql-test/r/maria-no-logging.result
mysql-test/r/maria-page-checksum.result
mysql-test/r/maria-preload.result
mysql-test/r/maria-purge.result
mysql-test/r/maria-recover.result
mysql-test/r/maria-recovery-big.result
mysql-test/r/maria-recovery-bitmap.result
mysql-test/r/maria-recovery-rtree-ft.result
mysql-test/r/maria-recovery.result
mysql-test/r/maria-recovery2.result
mysql-test/r/maria.result
mysql-test/r/maria2.result
mysql-test/r/maria3.result
mysql-test/r/maria_notembedded.result
mysql-test/r/old-mode.result
mysql-test/r/ps_maria.result
mysql-test/r/row-checksum-old.result
mysql-test/r/row-checksum.result
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/falcon_bug_31110.result
mysql-test/suite/falcon/r/falcon_bug_31114.result
mysql-test/suite/falcon/r/falcon_bug_31295.result
mysql-test/suite/falcon/r/falcon_bug_31311.result
mysql-test/suite/falcon/r/falcon_bug_32398.result
mysql-test/suite/falcon/r/falcon_bug_33212.result
mysql-test/suite/falcon/r/falcon_bug_33213.result
mysql-test/suite/falcon/r/falcon_bug_33397.result
mysql-test/suite/falcon/r/falcon_bug_33404.result
mysql-test/suite/falcon/r/falcon_bug_33723.result
mysql-test/suite/falcon/r/falcon_bug_34048.result
mysql-test/suite/falcon/r/falcon_bug_34617.result
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/falcon_bug_31110.test
mysql-test/suite/falcon/t/falcon_bug_31114.test
mysql-test/suite/falcon/t/falcon_bug_31295.test
mysql-test/suite/falcon/t/falcon_bug_31311.test
mysql-test/suite/falcon/t/falcon_bug_32398.test
mysql-test/suite/falcon/t/falcon_bug_33212.test
mysql-test/suite/falcon/t/falcon_bug_33213.test
mysql-test/suite/falcon/t/falcon_bug_33397.test
mysql-test/suite/falcon/t/falcon_bug_33404.test
mysql-test/suite/falcon/t/falcon_bug_33723.test
mysql-test/suite/falcon/t/falcon_bug_34048.test
mysql-test/suite/falcon/t/falcon_bug_34617.test
mysql-test/suite/falcon/t/falcon_bug_37080.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/falcon_team/
mysql-test/suite/falcon_team/r/
mysql-test/suite/falcon_team/r/falcon_bug_31296.result
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/
mysql-test/suite/falcon_team/t/disabled.def
mysql-test/suite/falcon_team/t/falcon_bug_31296.test
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
mysql-test/suite/rpl/r/rpl_stm_maria.result
mysql-test/suite/rpl/r/rpl_view_multi.result
mysql-test/suite/rpl/t/rpl_stm_maria.test
mysql-test/suite/rpl/t/rpl_view_multi.test
mysql-test/suite/rpl_ndb_big/
mysql-test/suite/rpl_ndb_big/r/
mysql-test/suite/rpl_ndb_big/t/
mysql-test/suite/rpl_ndb_big/t/disabled.def
mysql-test/t/drop-no_root.test
mysql-test/t/information_schema-big.test
mysql-test/t/maria-big.test
mysql-test/t/maria-connect.test
mysql-test/t/maria-gis-rtree-dynamic.test
mysql-test/t/maria-gis-rtree-trans.test
mysql-test/t/maria-gis-rtree.test
mysql-test/t/maria-mvcc.test
mysql-test/t/maria-no-logging.test
mysql-test/t/maria-page-checksum.test
mysql-test/t/maria-preload.test
mysql-test/t/maria-purge.test
mysql-test/t/maria-recover-master.opt
mysql-test/t/maria-recover.test
mysql-test/t/maria-recovery-big-master.opt
mysql-test/t/maria-recovery-big.test
mysql-test/t/maria-recovery-bitmap-master.opt
mysql-test/t/maria-recovery-bitmap.test
mysql-test/t/maria-recovery-master.opt
mysql-test/t/maria-recovery-rtree-ft-master.opt
mysql-test/t/maria-recovery-rtree-ft.test
mysql-test/t/maria-recovery.test
mysql-test/t/maria-recovery2-master.opt
mysql-test/t/maria-recovery2.test
mysql-test/t/maria.test
mysql-test/t/maria2.test
mysql-test/t/maria3.test
mysql-test/t/maria_notembedded.test
mysql-test/t/old-mode-master.opt
mysql-test/t/old-mode.test
mysql-test/t/ps_maria.test
mysql-test/t/row-checksum-old-master.opt
mysql-test/t/row-checksum-old.test
mysql-test/t/row-checksum.test
mysql-test/t/sync_frm_basic-master.opt
mysys/lf_alloc-pin.c
mysys/lf_dynarray.c
mysys/lf_hash.c
mysys/my_chmod.c
mysys/my_rnd.c
mysys/my_safehash.c
mysys/my_safehash.h
mysys/my_uuid.c
mysys/wqueue.c
sql-bench/myisam.cnf
sql/mdl.cc
sql/mdl.h
sql/sql_plist.h
storage/falcon/Backup.cpp
storage/falcon/Backup.h
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorBuffer.h
storage/falcon/SectorCache.cpp
storage/falcon/SectorCache.h
storage/falcon/WalkDeferred.cpp
storage/falcon/WalkDeferred.h
storage/falcon/WalkIndex.cpp
storage/falcon/WalkIndex.h
storage/maria/
storage/maria/CMakeLists.txt
storage/maria/KNOWN_BUGS.txt
storage/maria/Makefile.am
storage/maria/file_formats.txt
storage/maria/ft_maria.c
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/lockman.c
storage/maria/lockman.h
storage/maria/ma_bitmap.c
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.h
storage/maria/ma_cache.c
storage/maria/ma_changed.c
storage/maria/ma_check.c
storage/maria/ma_check_standalone.h
storage/maria/ma_checkpoint.c
storage/maria/ma_checkpoint.h
storage/maria/ma_checksum.c
storage/maria/ma_close.c
storage/maria/ma_commit.c
storage/maria/ma_commit.h
storage/maria/ma_control_file.c
storage/maria/ma_control_file.h
storage/maria/ma_create.c
storage/maria/ma_dbug.c
storage/maria/ma_delete.c
storage/maria/ma_delete_all.c
storage/maria/ma_delete_table.c
storage/maria/ma_dynrec.c
storage/maria/ma_extra.c
storage/maria/ma_ft_boolean_search.c
storage/maria/ma_ft_eval.c
storage/maria/ma_ft_eval.h
storage/maria/ma_ft_nlq_search.c
storage/maria/ma_ft_parser.c
storage/maria/ma_ft_stem.c
storage/maria/ma_ft_test1.c
storage/maria/ma_ft_test1.h
storage/maria/ma_ft_update.c
storage/maria/ma_ftdefs.h
storage/maria/ma_fulltext.h
storage/maria/ma_info.c
storage/maria/ma_init.c
storage/maria/ma_key.c
storage/maria/ma_key_recover.c
storage/maria/ma_key_recover.h
storage/maria/ma_keycache.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_loghandler_lsn.h
storage/maria/ma_open.c
storage/maria/ma_packrec.c
storage/maria/ma_page.c
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.h
storage/maria/ma_pagecaches.c
storage/maria/ma_pagecrc.c
storage/maria/ma_panic.c
storage/maria/ma_preload.c
storage/maria/ma_range.c
storage/maria/ma_recovery.c
storage/maria/ma_recovery.h
storage/maria/ma_recovery_util.c
storage/maria/ma_recovery_util.h
storage/maria/ma_rename.c
storage/maria/ma_rfirst.c
storage/maria/ma_rkey.c
storage/maria/ma_rlast.c
storage/maria/ma_rnext.c
storage/maria/ma_rnext_same.c
storage/maria/ma_rprev.c
storage/maria/ma_rrnd.c
storage/maria/ma_rsame.c
storage/maria/ma_rsamepos.c
storage/maria/ma_rt_index.c
storage/maria/ma_rt_index.h
storage/maria/ma_rt_key.c
storage/maria/ma_rt_key.h
storage/maria/ma_rt_mbr.c
storage/maria/ma_rt_mbr.h
storage/maria/ma_rt_split.c
storage/maria/ma_rt_test.c
storage/maria/ma_scan.c
storage/maria/ma_search.c
storage/maria/ma_sort.c
storage/maria/ma_sp_defs.h
storage/maria/ma_sp_key.c
storage/maria/ma_sp_test.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_static.c
storage/maria/ma_statrec.c
storage/maria/ma_test1.c
storage/maria/ma_test2.c
storage/maria/ma_test3.c
storage/maria/ma_test_all.res
storage/maria/ma_test_all.sh
storage/maria/ma_test_big.sh
storage/maria/ma_test_force_start.pl
storage/maria/ma_test_recovery
storage/maria/ma_unique.c
storage/maria/ma_update.c
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_def.h
storage/maria/maria_ftdump.c
storage/maria/maria_pack.c
storage/maria/maria_read_log.c
storage/maria/maria_rename.sh
storage/maria/plug.in
storage/maria/tablockman.c
storage/maria/tablockman.h
storage/maria/test_pack
storage/maria/trnman.c
storage/maria/trnman.h
storage/maria/trnman_public.h
storage/maria/unittest/
storage/maria/unittest/CMakeLists.txt
storage/maria/unittest/Makefile.am
storage/maria/unittest/lockman-t.c
storage/maria/unittest/lockman1-t.c
storage/maria/unittest/lockman2-t.c
storage/maria/unittest/ma_control_file-t.c
storage/maria/unittest/ma_loghandler_examples.c
storage/maria/unittest/ma_maria_log_cleanup.c
storage/maria/unittest/ma_pagecache_consist.c
storage/maria/unittest/ma_pagecache_rwconsist.c
storage/maria/unittest/ma_pagecache_single.c
storage/maria/unittest/ma_test_all-t
storage/maria/unittest/ma_test_loghandler-t.c
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c
storage/maria/unittest/ma_test_loghandler_multigroup-t.c
storage/maria/unittest/ma_test_loghandler_multithread-t.c
storage/maria/unittest/ma_test_loghandler_noflush-t.c
storage/maria/unittest/ma_test_loghandler_nologs-t.c
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
storage/maria/unittest/ma_test_loghandler_purge-t.c
storage/maria/unittest/ma_test_recovery.expected
storage/maria/unittest/ma_test_recovery.pl
storage/maria/unittest/sequence_storage.c
storage/maria/unittest/sequence_storage.h
storage/maria/unittest/test_file.c
storage/maria/unittest/test_file.h
storage/maria/unittest/trnman-t.c
storage/myisam/ft_myisam.c
storage/myisammrg/scripts/
storage/myisammrg/scripts/mysql_config.pl
vio/CMakeFiles/
renamed:
mysql-test/suite/falcon/r/falcon_bug_22165.result => mysql-test/suite/falcon_team/r/falcon_bug_22165.result
mysql-test/suite/falcon/r/falcon_bug_22166.result => mysql-test/suite/falcon_team/r/falcon_bug_22166.result
mysql-test/suite/falcon/r/falcon_bug_22169.result => mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon/r/falcon_bug_22173.result => mysql-test/suite/falcon_team/r/falcon_bug_22173.result
mysql-test/suite/falcon/r/falcon_bug_22173a.result => mysql-test/suite/falcon_team/r/falcon_bug_22173a.result
mysql-test/suite/falcon/r/falcon_bug_22187.result => mysql-test/suite/falcon_team/r/falcon_bug_22187.result
mysql-test/suite/falcon/r/falcon_bug_22189.result => mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon/r/falcon_bug_22207.result => mysql-test/suite/falcon_team/r/falcon_bug_22207.result
mysql-test/suite/falcon/r/falcon_bug_23189.result => mysql-test/suite/falcon_team/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_23692.result => mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon/r/falcon_bug_23945.result => mysql-test/suite/falcon_team/r/falcon_bug_23945.result
mysql-test/suite/falcon/r/falcon_bug_23962.result => mysql-test/suite/falcon_team/r/falcon_bug_23962.result
mysql-test/suite/falcon/r/falcon_bug_24024.result => mysql-test/suite/falcon_team/r/falcon_bug_24024.result
mysql-test/suite/falcon/r/falcon_bug_26433.result => mysql-test/suite/falcon_team/r/falcon_bug_26433.result
mysql-test/suite/falcon/r/falcon_bug_27997.result => mysql-test/suite/falcon_team/r/falcon_bug_27997.result
mysql-test/suite/falcon/r/falcon_bug_28006.result => mysql-test/suite/falcon_team/r/falcon_bug_28006.result
mysql-test/suite/falcon/r/falcon_bug_29246.result => mysql-test/suite/falcon_team/r/falcon_bug_29246.result
mysql-test/suite/falcon/r/falcon_bug_30282.result => mysql-test/suite/falcon_team/r/falcon_bug_30282.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result => mysql-test/suite/falcon_team/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34174.result => mysql-test/suite/falcon_team/r/falcon_bug_34174.result
mysql-test/suite/falcon/r/falcon_bug_34351_B.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/falcon_bug_34892.result => mysql-test/suite/falcon_team/r/falcon_bug_34892.result
mysql-test/suite/falcon/r/falcon_deadlock.result => mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon/r/falcon_read-committed.result => mysql-test/suite/falcon_team/r/falcon_read-committed.result
mysql-test/suite/falcon/r/ps_8falcon.result => mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/r/read_many_rows_falcon.result => mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon/t/falcon_bug_22165.test => mysql-test/suite/falcon_team/t/falcon_bug_22165.test
mysql-test/suite/falcon/t/falcon_bug_22166.test => mysql-test/suite/falcon_team/t/falcon_bug_22166.test
mysql-test/suite/falcon/t/falcon_bug_22169.test => mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon/t/falcon_bug_22173.test => mysql-test/suite/falcon_team/t/falcon_bug_22173.test
mysql-test/suite/falcon/t/falcon_bug_22173a.test => mysql-test/suite/falcon_team/t/falcon_bug_22173a.test
mysql-test/suite/falcon/t/falcon_bug_22187.test => mysql-test/suite/falcon_team/t/falcon_bug_22187.test
mysql-test/suite/falcon/t/falcon_bug_22189.test => mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon/t/falcon_bug_22207.test => mysql-test/suite/falcon_team/t/falcon_bug_22207.test
mysql-test/suite/falcon/t/falcon_bug_23189.test => mysql-test/suite/falcon_team/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_23692.test => mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon/t/falcon_bug_23945.test => mysql-test/suite/falcon_team/t/falcon_bug_23945.test
mysql-test/suite/falcon/t/falcon_bug_23962.test => mysql-test/suite/falcon_team/t/falcon_bug_23962.test
mysql-test/suite/falcon/t/falcon_bug_24024.test => mysql-test/suite/falcon_team/t/falcon_bug_24024.test
mysql-test/suite/falcon/t/falcon_bug_26433.test => mysql-test/suite/falcon_team/t/falcon_bug_26433.test
mysql-test/suite/falcon/t/falcon_bug_27997.test => mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon/t/falcon_bug_28006.test => mysql-test/suite/falcon_team/t/falcon_bug_28006.test
mysql-test/suite/falcon/t/falcon_bug_29246.test => mysql-test/suite/falcon_team/t/falcon_bug_29246.test
mysql-test/suite/falcon/t/falcon_bug_30282.test => mysql-test/suite/falcon_team/t/falcon_bug_30282.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test => mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34174.test => mysql-test/suite/falcon_team/t/falcon_bug_34174.test
mysql-test/suite/falcon/t/falcon_bug_34351_B.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/falcon_bug_34892.test => mysql-test/suite/falcon_team/t/falcon_bug_34892.test
mysql-test/suite/falcon/t/falcon_deadlock.test => mysql-test/suite/falcon_team/t/falcon_deadlock.test
mysql-test/suite/falcon/t/falcon_read-committed.test => mysql-test/suite/falcon_team/t/falcon_read-committed.test
mysql-test/suite/falcon/t/ps_8falcon.test => mysql-test/suite/falcon_team/t/ps_8falcon.test
mysql-test/suite/falcon/t/read_many_rows_falcon.test => mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_collation_charset_applic.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_collation_charset_applic.test
mysql-test/suite/large_tests/r/falcon_bug_22150-big.result => mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/large_tests/r/falcon_bug_22154.result => mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak2-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak2-big.result
mysql-test/suite/large_tests/t/falcon_bug_22150-big.test => mysql-test/suite/falcon/t/falcon_bug_22150-big.test
mysql-test/suite/large_tests/t/falcon_bug_22154.test => mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak2-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test
mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result => mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test => mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2myisam.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_2other.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_UUID.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_add_column.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_apply_status.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_auto_inc.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_bank.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_blob.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_blob2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_circular_simplex.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_commit_afterflush.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_dd_partitions.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_ddl.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_delete_nowhere.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_do_db.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_do_table.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_func003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_innodb_trans.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_insert_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_load.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi_update2.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_multi_update3.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_myisam2ndb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_relayrotate.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_rep_ignore.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_row_001.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sp003.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sp006.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_stm_innodb.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_sync.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_transaction.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndb_trig004.result
mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result => mysql-test/suite/rpl_ndb_big/r/rpl_ndbapi_multi.result
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result => mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result => mysql-test/suite/rpl_ndb_big/r/rpl_truncate_7ndb.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2myisam.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2other-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_2other.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_UUID.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_add_column.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_apply_status-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_apply_status.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_auto_inc.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_bank.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_blob.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_blob2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_circular_simplex.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_commit_afterflush.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt => mysql-test/suite/rpl_ndb_big/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_big/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_dd_partitions.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_ddl.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_delete_nowhere.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_db-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_db.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_table-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_do_table.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_func003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_innodb_trans-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_innodb_trans.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_insert_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_load.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_log.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update2-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update2.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_multi_update3.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_myisam2ndb-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_myisam2ndb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_relayrotate-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_relayrotate.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_rep_ignore-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_rep_ignore.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_row_001.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sp003.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sp006.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_stm_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_stm_innodb.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_sync.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-master.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction-slave.opt => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_transaction.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndb_trig004.test
mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test => mysql-test/suite/rpl_ndb_big/t/rpl_ndbapi_multi.test
mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test => mysql-test/suite/rpl_ndb_big/t/rpl_row_basic_7ndb.test
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test => mysql-test/suite/rpl_ndb_big/t/rpl_truncate_7ndb.test
modified:
.bzr-mysql/default.conf
.bzrignore
BUILD/SETUP.sh
BUILD/compile-dist
BitKeeper/triggers/post-commit
BitKeeper/triggers/pre-delta
CMakeLists.txt
Makefile.am
client/get_password.c
client/mysqladmin.cc
client/mysqltest.c
cmd-line-utils/readline/bind.c
cmd-line-utils/readline/chardefs.h
cmd-line-utils/readline/display.c
cmd-line-utils/readline/histexpand.c
cmd-line-utils/readline/history.c
cmd-line-utils/readline/readline.c
cmd-line-utils/readline/text.c
config/ac-macros/plugins.m4
configure.in
dbug/CMakeLists.txt*
dbug/Makefile.am
dbug/dbug.c
dbug/dbug_add_tags.pl
dbug/user.r
extra/Makefile.am
extra/replace.c
include/Makefile.am
include/atomic/gcc_builtins.h
include/atomic/rwlock.h
include/config-win.h
include/ft_global.h
include/keycache.h
include/m_string.h
include/my_alloc.h
include/my_atomic.h
include/my_base.h
include/my_dbug.h
include/my_global.h
include/my_handler.h
include/my_pthread.h
include/my_sys.h
include/my_tree.h
include/myisam.h
include/myisampack.h
include/mysql/plugin.h
include/mysql_com.h
include/mysys_err.h
include/thr_lock.h
libmysql/CMakeLists.txt
libmysql/Makefile.shared
libmysql/libmysql.c
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
mysql-test/include/handler.inc
mysql-test/include/locktrans.inc
mysql-test/include/ps_conv.inc
mysql-test/include/query_cache_sql_prepare.inc
mysql-test/include/varchar.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/install_test_db.sh
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/change_user.result
mysql-test/r/create.result
mysql-test/r/flush.result
mysql-test/r/flush_table.result
mysql-test/r/func_gconcat.result
mysql-test/r/group_concat_max_len_func.result
mysql-test/r/handler_innodb.result
mysql-test/r/handler_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_parameters.result
mysql-test/r/information_schema_routines.result
mysql-test/r/innodb.result
mysql-test/r/join_outer.result
mysql-test/r/kill.result
mysql-test/r/lock.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/merge.result
mysql-test/r/mix2_myisam.result
mysql-test/r/myisam.result
mysql-test/r/mysqldump.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/ps_ddl.result
mysql-test/r/query_cache.result
mysql-test/r/query_cache_ps_no_prot.result
mysql-test/r/query_cache_ps_ps_prot.result
mysql-test/r/sp.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/variables-big.result
mysql-test/r/view.result
mysql-test/r/view_grant.result
mysql-test/suite/falcon/r/falcon_bug_22183.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/falcon/r/falcon_bug_26828.result
mysql-test/suite/falcon/r/falcon_bug_29511.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/falcon_select.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug.template
mysql-test/suite/falcon/t/falcon_bug_22183.test
mysql-test/suite/falcon/t/falcon_bug_26828.test
mysql-test/suite/falcon/t/falcon_bug_29511.test
mysql-test/suite/falcon/t/falcon_bug_30031.test
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_select.test
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
mysql-test/suite/funcs_1/datadict/processlist_val.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns.result
mysql-test/suite/funcs_1/r/is_events.result
mysql-test/suite/funcs_1/r/is_routines.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/is_triggers.result
mysql-test/suite/funcs_1/r/is_views.result
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
mysql-test/suite/funcs_1/t/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/ndb/r/ndb_auto_increment.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/ndb_auto_increment.test
mysql-test/suite/rpl/r/rpl_insert.result
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
mysql-test/suite/rpl/r/rpl_trigger.result
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
mysql-test/suite/rpl/t/rpl_insert.test
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/t/alter_table.test
mysql-test/t/change_user.test
mysql-test/t/crash_commit_before-master.opt
mysql-test/t/create.test
mysql-test/t/delayed.test
mysql-test/t/disabled.def
mysql-test/t/flush.test
mysql-test/t/flush_table.test
mysql-test/t/func_gconcat.test
mysql-test/t/information_schema.test
mysql-test/t/information_schema_parameters.test
mysql-test/t/information_schema_routines.test
mysql-test/t/kill.test
mysql-test/t/lock.test
mysql-test/t/lock_multi.test
mysql-test/t/merge-big.test
mysql-test/t/merge.test
mysql-test/t/myisam.test
mysql-test/t/mysqldump.test
mysql-test/t/ps_ddl.test
mysql-test/t/query_cache.test
mysql-test/t/query_cache_debug.test
mysql-test/t/query_cache_merge.test
mysql-test/t/sp.test
mysql-test/t/subselect.test
mysql-test/t/trigger_notembedded.test
mysql-test/t/variables-big.test
mysql-test/t/view.test
mysql-test/t/view_grant.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/array.c
mysys/checksum.c
mysys/errors.c
mysys/hash.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_keycaches.c
mysys/my_bitmap.c
mysys/my_compress.c
mysys/my_error.c
mysys/my_fopen.c
mysys/my_getopt.c
mysys/my_handler.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_lock.c
mysys/my_pread.c
mysys/my_read.c
mysys/my_seek.c
mysys/my_static.c
mysys/my_static.h
mysys/my_sync.c
mysys/my_thr_init.c
mysys/my_winthread.c
mysys/my_write.c
mysys/safemalloc.c
mysys/thr_lock.c
mysys/thr_mutex.c
plugin/daemon_example/daemon_example.cc
scripts/Makefile.am
scripts/mysql_fix_privilege_tables.sh
sql-bench/example
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/backup_progress.cc
sql/backup/be_default.cc
sql/backup/be_default.h
sql/backup/be_thread.cc
sql/backup/be_thread.h
sql/backup/kernel.cc
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/events.cc
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.cc
sql/item_sum.cc
sql/item_sum.h
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/log.cc
sql/log_event.cc
sql/log_event_old.cc
sql/my_lock.c
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_sum.cc
sql/partition_info.cc
sql/password.c
sql/protocol.cc
sql/rpl_filter.cc
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/scheduler.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/si_objects.cc
sql/sp.cc
sql/sp_head.cc
sql/spatial.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_bitmap.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_insert.cc
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_profile.h
sql/sql_rename.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_show.cc
sql/sql_sort.h
sql/sql_table.cc
sql/sql_tablespace.cc
sql/sql_test.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_union.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/time.cc
sql/unireg.cc
storage/archive/ha_archive.cc
storage/archive/ha_archive.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/falcon/AsciiBlob.cpp
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/BinaryBlob.cpp
storage/falcon/Bitmap.cpp
storage/falcon/BlobReference.cpp
storage/falcon/BlobReference.h
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/Configuration.cpp
storage/falcon/DataOverflowPage.cpp
storage/falcon/DataOverflowPage.h
storage/falcon/DataPage.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/DateTime.cpp
storage/falcon/Decompress.cpp
storage/falcon/DeferredIndex.h
storage/falcon/DeferredIndexWalker.cpp
storage/falcon/DeferredIndexWalker.h
storage/falcon/EncodedDataStream.cpp
storage/falcon/EncodedDataStream.h
storage/falcon/Engine.h
storage/falcon/Error.cpp
storage/falcon/Error.h
storage/falcon/Event.cpp
storage/falcon/Format.cpp
storage/falcon/Format.h
storage/falcon/Gopher.cpp
storage/falcon/Hdr.cpp
storage/falcon/Hdr.h
storage/falcon/IO.cpp
storage/falcon/Index.cpp
storage/falcon/Index.h
storage/falcon/IndexPage.cpp
storage/falcon/IndexPage.h
storage/falcon/IndexRootPage.cpp
storage/falcon/IndexRootPage.h
storage/falcon/Interlock.h
storage/falcon/InversionPage.cpp
storage/falcon/InversionPage.h
storage/falcon/License.cpp
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/Page.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/PageInventoryPage.h
storage/falcon/PageWriter.cpp
storage/falcon/PriorityScheduler.cpp
storage/falcon/Protocol.cpp
storage/falcon/Record.cpp
storage/falcon/Record.h
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordLocatorPage.h
storage/falcon/RecordScavenge.cpp
storage/falcon/RecordScavenge.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecordVersion.h
storage/falcon/SQLError.cpp
storage/falcon/SQLException.h
storage/falcon/SRLDropTable.cpp
storage/falcon/SRLDropTableSpace.cpp
storage/falcon/Section.cpp
storage/falcon/SectionPage.cpp
storage/falcon/SectionPage.h
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/SerialLogTransaction.cpp
storage/falcon/SerialLogTransaction.h
storage/falcon/Socket.cpp
storage/falcon/Socket.h
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageParameters.h
storage/falcon/StorageTable.cpp
storage/falcon/StorageTable.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/StorageVersion.h
storage/falcon/Stream.cpp
storage/falcon/Stream.h
storage/falcon/StreamSegment.cpp
storage/falcon/SymbolManager.cpp
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/SyncTest.cpp
storage/falcon/SyncTest.h
storage/falcon/Synchronize.cpp
storage/falcon/Synchronize.h
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/TimeStamp.cpp
storage/falcon/TimeStamp.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/TransactionManager.h
storage/falcon/TransformLib/Makefile.am
storage/falcon/Types.h
storage/falcon/Value.cpp
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/falcon/plug.in
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/hp_write.c
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_boolean_search.c
storage/myisam/ft_static.c
storage/myisam/ft_stopwords.c
storage/myisam/fulltext.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_cache.c
storage/myisam/mi_check.c
storage/myisam/mi_checksum.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_key.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_range.c
storage/myisam/mi_rkey.c
storage/myisam/mi_search.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/plug.in
storage/myisam/rt_index.c
storage/myisam/rt_test.c
storage/myisam/sort.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/myisammrg/myrg_extra.c
strings/CMakeLists.txt
strings/bmove512.c
strings/ctype.c
strings/my_vsnprintf.c
strings/strmake.c
support-files/compiler_warnings.supp
support-files/magic
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/Makefile.am
unittest/mysys/Makefile.am
unittest/mysys/my_atomic-t.c
unittest/mytap/tap.c
unittest/mytap/tap.h
unittest/unit.pl
win/configure.js
mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/falcon/t/falcon_bug_22150-big.test
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result
mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_dd_partitions.result
2706 Gleb Shchepa 2008-07-11
rollback of bug #35848 patch in 6.0: this code have to be ported
into ./mysys/my_uuid.c
modified:
mysql-test/r/func_misc.result
mysql-test/t/func_misc.test
sql/item_strfunc.cc
2705 Tatiana A. Nurnberg 2008-07-10 [merge]
auto-merge
added:
mysql-test/suite/bugs/combinations
mysql-test/suite/bugs/r/rpl_bug37426.result
mysql-test/suite/bugs/t/rpl_bug37426.test
modified:
client/mysqltest.c
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/r/mysqltest.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/t/binlog_base64_flag.test
mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/parts/inc/partition_check_drop.inc
mysql-test/suite/parts/inc/partition_layout.inc
mysql-test/suite/parts/inc/partition_layout_check1.inc
mysql-test/suite/parts/inc/partition_layout_check2.inc
mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
mysql-test/suite/parts/r/partition_alter1_1_myisam.result
mysql-test/suite/parts/r/partition_alter1_2_myisam.result
mysql-test/suite/parts/r/partition_alter2_myisam.result
mysql-test/suite/parts/r/partition_alter3_innodb.result
mysql-test/suite/parts/r/partition_alter3_myisam.result
mysql-test/suite/parts/r/partition_basic_innodb.result
mysql-test/suite/parts/r/partition_basic_myisam.result
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
mysql-test/suite/parts/r/partition_engine_myisam.result
mysql-test/suite/parts/r/partition_syntax_myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/t/mysqltest.test
sql/field.cc
sql/field.h
sql/rpl_utility.cc
sql/slave.cc
sql/slave.h
sql/sql_insert.cc
2704 Tatiana A. Nurnberg 2008-07-10 [merge]
Bug#35848: UUID() returns UUIDs with the wrong time
offset for time part in UUIDs was 1/1000 of what it
should be. In other words, offset was off.
Also handle the case where we count into the future
when several UUIDs are generated in one "tick", and
then the next call is late enough for us to unwind
some but not all of those borrowed ticks.
Lastly, handle the case where we keep borrowing and
borrowing until the tick-counter overflows by also
changing into a new "numberspace" by creating a new
random suffix.
modified:
mysql-test/r/func_misc.result
mysql-test/t/func_misc.test
sql/item_strfunc.cc
2703 Marc Alff 2008-07-08 [merge]
NULL merge of ndb_storedproc.result from 5.1-bugteam to 6.0-bugteam
2702 Marc Alff 2008-07-08 [merge]
Manual merge of mysql_5.1-bugteam to mysql_6.0-bugteam
removed:
mysql-test/r/parser.result
mysql-test/t/parser.test
renamed:
mysql-test/r/parser.result.moved => mysql-test/r/parser.result
mysql-test/t/parser.test.moved => mysql-test/t/parser.test
modified:
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/ndb_storedproc.result
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/t/disabled.def
2701 Mats Kindahl 2008-07-08 [merge]
Manual merge of mysql-5.1-bugteam -> mysql-6.0-bugteam
added:
mysql-test/r/parser.result
mysql-test/t/parser.test
renamed:
mysql-test/r/parser.result => mysql-test/r/parser.result.moved
mysql-test/t/parser.test => mysql-test/t/parser.test.moved
modified:
sql/log_event.cc
2700 Mattias Jonsson 2008-07-08
post merge updates (51-bugteam -> 60-bugteam)
modified:
mysql-test/suite/parts/r/ndb_dd_backuprestore.result
mysql-test/suite/parts/r/partition_engine_ndb.result
2699 Mattias Jonsson 2008-07-08 [merge]
merge (updated 51-bugteam -> 60-bugteam)
modified:
sql/sql_yacc.yy
2698 Mattias Jonsson 2008-07-08 [merge]
merge from 51-bugteam -> 60-bugteam
removed:
mysql-test/suite/parts/r/ndb_blob_partition.result
mysql-test/suite/parts/r/ndb_partition_error.result
mysql-test/suite/parts/r/ndb_partition_key.result
mysql-test/suite/parts/r/ndb_partition_list.result
mysql-test/suite/parts/r/ndb_partition_range.result
mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
mysql-test/suite/parts/t/ndb_blob_partition.test
mysql-test/suite/parts/t/ndb_partition_error.test
mysql-test/suite/parts/t/ndb_partition_key.test
mysql-test/suite/parts/t/ndb_partition_list.test
mysql-test/suite/parts/t/ndb_partition_range.test
mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
modified:
mysql-test/r/partition.result
mysql-test/r/partition_hash.result
mysql-test/r/partition_pruning.result
mysql-test/r/partition_range.result
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
mysql-test/suite/parts/inc/partition_alter_11.inc
mysql-test/suite/parts/inc/partition_bigint.inc
mysql-test/suite/parts/inc/partition_int.inc
mysql-test/suite/parts/inc/partition_mediumint.inc
mysql-test/suite/parts/inc/partition_smallint.inc
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
mysql-test/suite/parts/inc/partition_tinyint.inc
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_innodb.result
mysql-test/suite/parts/r/partition_alter1_1_myisam.result
mysql-test/suite/parts/r/partition_alter1_2_innodb.result
mysql-test/suite/parts/r/partition_alter1_2_myisam.result
mysql-test/suite/parts/r/partition_alter2_innodb.result
mysql-test/suite/parts/r/partition_alter2_myisam.result
mysql-test/suite/parts/r/partition_alter3_innodb.result
mysql-test/suite/parts/r/partition_alter3_myisam.result
mysql-test/suite/parts/r/partition_engine_ndb.result
mysql-test/suite/parts/r/partition_int_innodb.result
mysql-test/suite/parts/r/partition_int_myisam.result
mysql-test/suite/parts/r/partition_int_ndb.result
mysql-test/suite/parts/t/disabled.def
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_alter2_ndb.test
mysql-test/suite/parts/t/partition_basic_ndb.test
mysql-test/suite/parts/t/partition_bit_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_syntax_ndb.test
mysql-test/suite/parts/t/partition_value_ndb.test
sql/ha_partition.cc
sql/ha_partition.h
2697 Georgi Kodinov 2008-07-07 [merge]
merge of the addendum fix for bug 37627 5.1-bugteam->6.0-bugteam
added:
mysql-test/r/subselect_debug.result
mysql-test/t/subselect_debug.test
modified:
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/t/subselect.test
2696 Chad MILLER 2008-07-04 [merge]
Merge from 5.1. Add files new to 6.0.
modified:
mysql-test/include/have_big5.inc
mysql-test/include/have_binlog_format_mixed.inc
mysql-test/include/have_binlog_format_mixed_or_row.inc
mysql-test/include/have_binlog_format_mixed_or_statement.inc
mysql-test/include/have_binlog_format_row.inc
mysql-test/include/have_binlog_format_row_or_statement.inc
mysql-test/include/have_binlog_format_statement.inc
mysql-test/include/have_bug25714.inc
mysql-test/include/have_case_sensitive_file_system.inc
mysql-test/include/have_community_features.inc
mysql-test/include/have_compress.inc
mysql-test/include/have_cp1250_ch.inc
mysql-test/include/have_cp932.inc
mysql-test/include/have_crypt.inc
mysql-test/include/have_debug.inc
mysql-test/include/have_eucjpms.inc
mysql-test/include/have_euckr.inc
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_gb2312.inc
mysql-test/include/have_gbk.inc
mysql-test/include/have_geometry.inc
mysql-test/include/have_latin2_ch.inc
mysql-test/include/have_log_bin.inc
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_ndbapi_examples.inc
mysql-test/include/have_outfile.inc
mysql-test/include/have_partition.inc
mysql-test/include/have_pool_of_threads.inc
mysql-test/include/have_query_cache.inc
mysql-test/include/have_sjis.inc
mysql-test/include/have_ssl_communication.inc
mysql-test/include/have_ssl_crypto_functs.inc
mysql-test/include/have_symlink.inc
mysql-test/include/have_tis620.inc
mysql-test/include/have_ucs2.inc
mysql-test/include/have_udf.inc
mysql-test/include/have_ujis.inc
mysql-test/include/have_utf16.inc
mysql-test/include/have_utf32.inc
2695 Georgi Kodinov 2008-07-04 [merge]
merged 5.1-bugteam to 6.0-bugteam (re. bug #37627)
2694 Georgi Kodinov 2008-07-04 [merge]
merge of bug #37627 5.1-bugteam->6.0-bugteam
modified:
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/t/subselect.test
sql/item_subselect.cc
2693 Davi Arnaut 2008-07-03 [merge]
Auto merge.
modified:
mysql-test/r/ps_ddl.result
mysql-test/r/ps_ddl1.result
mysql-test/r/sp-error.result
mysql-test/t/ps_ddl.test
mysql-test/t/ps_ddl1.test
mysql-test/t/sp-error.test
sql/sp_cache.cc
sql/sp_cache.h
sql/sql_prepare.cc
2692 Sven Sandberg 2008-07-03 [merge]
up-merge from 5.1-bugteam
modified:
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
2691 Timothy Smith 2008-07-02 [merge]
Up-merge syntax fix from mysql-5.0-bugteam
modified:
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
mysys/default.c
2690 Patrick Crews 2008-07-01 [merge]
upmerge into 6.0
modified:
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
2689 Sven Sandberg 2008-06-30 [merge]
Merge from 5.1-bugteam.
modified:
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
2688 Timothy Smith 2008-06-27 [merge]
Up-merge from 5.1: Merge from upstream (my:5.0-bugteam)
2687 Timothy Smith 2008-06-27 [merge]
Up-merge from 5.1: Fix for Bug#20748, Configuration files should not be read more than once
modified:
mysys/default.c
2686 Gleb Shchepa 2008-06-27 [merge]
auto merge 5.1-bugteam --> 6.0-bugteam
modified:
mysql-test/r/group_min_max_innodb.result
mysql-test/t/group_min_max_innodb.test
sql/sql_select.cc
2685 Gleb Shchepa 2008-06-27 [merge]
merge 5.1-bugteam --> 6.0-bugteam
2684 Gleb Shchepa 2008-06-27 [merge]
merge 5.1-bugteam --> 6.0-bugteam
2683 Matthias Leich 2008-06-25 [merge]
Upmerge 5.1 -> 6.0
added:
mysql-test/include/wait_condition.inc
renamed:
mysql-test/include/wait_condition.inc => mysql-test/include/wait_condition.inc.moved
modified:
mysql-test/t/subselect.test
2682 Davi Arnaut 2008-06-25
Disable main.status test case due to Bug#37481
modified:
mysql-test/t/disabled.def
2681 Gleb Shchepa 2008-06-25 [merge]
auto merge 5.1-bugteam --> 6.0-bugteam
2680 Gleb Shchepa 2008-06-25 [merge]
auto merge 6.0-main --> 6.0-bugteam
added:
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb_bug34053.result
mysql-test/r/innodb_bug34300.result
mysql-test/r/innodb_bug35220.result
mysql-test/suite/bugs/r/rpl_bug33029.result
mysql-test/suite/bugs/t/rpl_bug33029.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb_bug34053.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/innodb_bug35220.test
modified:
Makefile.am
config/ac-macros/libevent.m4
mysql-test/r/innodb.result
mysql-test/r/partition_innodb.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/t/innodb.test
mysql-test/t/partition_innodb.test
mysql-test/t/subselect.test
sql/slave.cc
sql/sql_class.cc
sql/sql_select.cc
sql/structs.h
storage/innobase/Makefile.am
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buf.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/include/buf0buf.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/mach0data.h
storage/innobase/include/mach0data.ic
storage/innobase/include/os0sync.h
storage/innobase/include/read0read.h
storage/innobase/include/row0mysql.h
storage/innobase/include/row0sel.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0arr.h
storage/innobase/include/sync0rw.h
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0sync.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/include/ut0ut.h
storage/innobase/os/os0file.c
storage/innobase/os/os0sync.c
storage/innobase/plug.in
storage/innobase/read/read0read.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0ut.c
2679 Gleb Shchepa 2008-06-24 [merge]
auto merge 5.1-bugteam --> 6.0-bugteam
modified:
client/mysql.cc
mysql-test/r/mysql.result
mysql-test/t/mysql_delimiter.sql
2678 Matthias Leich 2008-06-20 [merge]
Null merge, we already have this stuff
within the branch
2677 Matthias Leich 2008-06-20 [merge]
automatic merge
added:
mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
mysql-test/suite/funcs_1/datadict/is_routines.inc
mysql-test/suite/funcs_1/datadict/is_schemata.inc
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/datadict/is_triggers.inc
mysql-test/suite/funcs_1/datadict/is_views.inc
mysql-test/suite/funcs_1/datadict/tables.inc
mysql-test/suite/funcs_1/include/bug28309_skip.inc
mysql-test/suite/funcs_1/r/is_cml_falcon.result
mysql-test/suite/funcs_1/r/is_cml_innodb.result
mysql-test/suite/funcs_1/r/is_cml_memory.result
mysql-test/suite/funcs_1/r/is_cml_myisam.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_columns_falcon.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
mysql-test/suite/funcs_1/r/is_routines_embedded.result
mysql-test/suite/funcs_1/r/is_schemata_embedded.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_embedded.result
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_triggers_embedded.result
mysql-test/suite/funcs_1/r/is_views_embedded.result
mysql-test/suite/funcs_1/t/is_cml_falcon.test
mysql-test/suite/funcs_1/t/is_cml_innodb.test
mysql-test/suite/funcs_1/t/is_cml_memory.test
mysql-test/suite/funcs_1/t/is_cml_myisam.test
mysql-test/suite/funcs_1/t/is_cml_ndb.test
mysql-test/suite/funcs_1/t/is_columns_falcon.test
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
mysql-test/suite/funcs_1/t/is_routines_embedded.test
mysql-test/suite/funcs_1/t/is_schemata_embedded.test
mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_tables_embedded.test
mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
mysql-test/suite/funcs_1/t/is_triggers_embedded.test
mysql-test/suite/funcs_1/t/is_views_embedded.test
modified:
mysql-test/suite/funcs_1/datadict/columns.inc
mysql-test/suite/funcs_1/datadict/datadict_load.inc
mysql-test/suite/funcs_1/datadict/tables1.inc
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/include/falcon_tb1.inc
mysql-test/suite/funcs_1/include/falcon_tb3.inc
mysql-test/suite/funcs_1/include/falcon_tb4.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/r/falcon_func_view.result
mysql-test/suite/funcs_1/r/falcon_trig_frkey.result
mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/is_columns_innodb.result
mysql-test/suite/funcs_1/r/is_columns_memory.result
mysql-test/suite/funcs_1/r/is_columns_myisam.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.result
mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_03.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_10.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_03.result
mysql-test/suite/funcs_1/r/memory_trig_03e.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_08.result
mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam_bitdata.result
mysql-test/suite/funcs_1/r/myisam_cursors.result
mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_08.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/ndb_func_view.result
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/falcon_trig_03e.test
mysql-test/suite/funcs_1/t/falcon_trig_frkey.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_trig_03e.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
mysql-test/suite/funcs_1/t/is_basics_mixed.test
mysql-test/suite/funcs_1/t/is_character_sets.test
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
mysql-test/suite/funcs_1/t/is_collations.test
mysql-test/suite/funcs_1/t/is_column_privileges.test
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_columns_innodb.test
mysql-test/suite/funcs_1/t/is_columns_is.test
mysql-test/suite/funcs_1/t/is_columns_is_falcon.test
mysql-test/suite/funcs_1/t/is_columns_memory.test
mysql-test/suite/funcs_1/t/is_columns_myisam.test
mysql-test/suite/funcs_1/t/is_columns_mysql.test
mysql-test/suite/funcs_1/t/is_columns_ndb.test
mysql-test/suite/funcs_1/t/is_engines.test
mysql-test/suite/funcs_1/t/is_events.test
mysql-test/suite/funcs_1/t/is_key_column_usage.test
mysql-test/suite/funcs_1/t/is_routines.test
mysql-test/suite/funcs_1/t/is_schema_privileges.test
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_schemata.test
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
mysql-test/suite/funcs_1/t/is_statistics.test
mysql-test/suite/funcs_1/t/is_statistics_mysql.test
mysql-test/suite/funcs_1/t/is_table_constraints.test
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
mysql-test/suite/funcs_1/t/is_table_privileges.test
mysql-test/suite/funcs_1/t/is_tables.test
mysql-test/suite/funcs_1/t/is_tables_innodb.test
mysql-test/suite/funcs_1/t/is_tables_memory.test
mysql-test/suite/funcs_1/t/is_tables_myisam.test
mysql-test/suite/funcs_1/t/is_tables_mysql.test
mysql-test/suite/funcs_1/t/is_tables_ndb.test
mysql-test/suite/funcs_1/t/is_triggers.test
mysql-test/suite/funcs_1/t/is_user_privileges.test
mysql-test/suite/funcs_1/t/is_views.test
mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test
mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc_02.test
mysql-test/suite/funcs_1/t/memory_storedproc_03.test
mysql-test/suite/funcs_1/t/memory_storedproc_06.test
mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_08.test
mysql-test/suite/funcs_1/t/memory_storedproc_10.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_03e.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test
mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
mysql-test/suite/funcs_1/t/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test
mysql-test/suite/funcs_1/t/myisam_trig_03e.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/ndb_storedproc.test
mysql-test/suite/funcs_1/t/ndb_trig_03e.test
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test
mysql-test/suite/funcs_1/t/processlist_priv_ps.test
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test
mysql-test/suite/funcs_1/t/processlist_val_ps.test
mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/views_master.inc
2676 Davi Arnaut 2008-06-20 [merge]
Manual merge.
renamed:
sql/stacktrace.c => mysys/stacktrace.c
sql/stacktrace.h => include/my_stacktrace.h
modified:
client/CMakeLists.txt
client/Makefile.am
client/mysqltest.c
configure.in
include/Makefile.am
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
mysql-test/include/mix1.inc
mysql-test/r/alter_table.result
mysql-test/r/innodb_mysql.result
mysql-test/t/alter_table.test
mysql-test/t/sql_low_priority_updates_func.test
mysys/CMakeLists.txt
mysys/Makefile.am
sql/CMakeLists.txt
sql/Makefile.am
sql/mysqld.cc
sql/sql_table.cc
mysys/stacktrace.c
include/my_stacktrace.h
2675 Gleb Shchepa 2008-06-19 [merge]
auto merge with local tree (bug #37076)
modified:
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
sql/field.h
2674 Georgi Kodinov 2008-06-18 [merge]
merge of 6.0
modified:
mysql-test/r/repair.result
scripts/make_binary_distribution.sh
sql/sql_table.cc
2673 Georgi Kodinov 2008-06-18 [merge]
merge of 6.0-bugteam
2672 Georgi Kodinov 2008-06-18 [merge]
merge 5.1-bugteam to 6.0-bugteam
modified:
mysql-test/r/partition.result
mysql-test/t/partition.test
mysys/errors.c
=== modified file 'mysql-test/include/master-slave.inc'
--- a/mysql-test/include/master-slave.inc 2007-06-07 18:27:19 +0000
+++ b/mysql-test/include/master-slave.inc 2008-07-16 20:13:02 +0000
@@ -8,5 +8,7 @@ connect (slave1,127.0.0.1,root,,test,$SL
-- source include/master-slave-reset.inc
+connection master;
+sync_slave_with_master;
# Set the default connection to 'master'
connection master;
=== modified file 'mysql-test/suite/rpl/r/rpl_000015.result'
--- a/mysql-test/suite/rpl/r/rpl_000015.result 2008-02-05 13:30:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000015.result 2008-07-16 20:13:02 +0000
@@ -44,6 +44,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 0
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT, MASTER_CONNECT_RETRY=7;
SHOW SLAVE STATUS;
@@ -85,6 +87,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 0
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -125,6 +129,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);
=== modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result 2008-05-01 05:25:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result 2008-07-16 20:13:02 +0000
@@ -44,3 +44,5 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 0
=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result 2008-01-14 07:38:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result 2008-07-16 20:13:02 +0000
@@ -50,6 +50,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
change master to master_user='root';
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -90,6 +92,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave;
select * from t1;
n
=== modified file 'mysql-test/suite/rpl/r/rpl_deadlock_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2008-02-03 09:00:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2008-07-16 20:13:02 +0000
@@ -83,6 +83,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
delete from t3;
change master to master_log_pos=549;
@@ -142,6 +144,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
set @my_max_relay_log_size= @@global.max_relay_log_size;
set global max_relay_log_size=0;
stop slave;
@@ -206,6 +210,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
drop table t1,t2,t3,t4;
set global max_relay_log_size= @my_max_relay_log_size;
End of 5.1 tests
=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2008-03-25 15:10:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2008-07-16 20:13:02 +0000
@@ -92,6 +92,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
SELECT * FROM t2 ORDER BY a;
@@ -159,6 +161,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@@ -221,6 +225,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@@ -283,6 +289,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@@ -344,6 +352,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@@ -453,6 +463,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
@@ -512,6 +524,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@@ -573,6 +587,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@@ -823,6 +839,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
*** Try to insert in master ****
@@ -959,6 +977,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***
=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2008-04-02 09:33:21 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2008-07-16 20:13:02 +0000
@@ -92,6 +92,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
SELECT * FROM t2 ORDER BY a;
@@ -159,6 +161,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@@ -221,6 +225,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@@ -283,6 +289,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@@ -344,6 +352,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@@ -453,6 +463,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
@@ -512,6 +524,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@@ -573,6 +587,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@@ -823,6 +839,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
*** Try to insert in master ****
@@ -959,6 +977,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***
=== modified file 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result'
--- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result 2008-03-05 06:17:41 +0000
+++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result 2008-07-16 20:13:02 +0000
@@ -63,3 +63,5 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 2
=== modified file 'mysql-test/suite/rpl/r/rpl_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_grant.result 2008-02-05 13:30:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_grant.result 2008-07-16 20:13:02 +0000
@@ -82,3 +82,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
=== modified file 'mysql-test/suite/rpl/r/rpl_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_incident.result 2007-10-26 20:40:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_incident.result 2008-07-16 20:13:02 +0000
@@ -64,6 +64,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1590
Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@@ -111,4 +113,6 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
DROP TABLE t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_known_bugs_detection.result'
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result 2008-02-03 09:00:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result 2008-07-16 20:13:02 +0000
@@ -50,6 +50,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1105
Last_SQL_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT * FROM t1;
a b
stop slave;
@@ -141,6 +143,8 @@ SELECT t2.field_a, t2.field_b, t2.field_
FROM t2
ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c'
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT * FROM t1;
id field_1 field_2 field_3
drop table t1, t2;
=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result 2008-03-14 17:14:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result 2008-07-16 20:13:02 +0000
@@ -73,6 +73,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@@ -119,6 +121,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@@ -166,6 +170,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
reset master;
create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=MyISAM;
=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_fatal.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result 2008-02-03 09:00:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result 2008-07-16 20:13:02 +0000
@@ -45,6 +45,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE t1;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -85,6 +87,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1593
Last_SQL_Error Fatal error: Not enough memory
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
DROP TABLE t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-06-26 18:56:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-07-16 20:13:02 +0000
@@ -969,3 +969,5 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-06-26 18:56:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-07-16 20:13:02 +0000
@@ -441,3 +441,5 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result 2008-05-01 09:34:54 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result 2008-07-16 20:13:02 +0000
@@ -70,3 +70,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
=== modified file 'mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result'
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-04-02 13:14:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2008-07-16 20:13:02 +0000
@@ -62,6 +62,8 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
=== modified file 'mysql-test/suite/rpl/r/rpl_replicate_do.result'
--- a/mysql-test/suite/rpl/r/rpl_replicate_do.result 2007-07-04 20:38:53 +0000
+++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result 2008-07-16 20:13:02 +0000
@@ -65,6 +65,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
create table t1 (ts timestamp);
set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00');
=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2008-01-14 07:38:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2008-07-16 20:13:02 +0000
@@ -53,6 +53,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
select * from t1;
s
Could not break slave
@@ -134,6 +136,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
select * from t2;
m
34
@@ -198,6 +202,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
=== modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result 2007-10-27 22:09:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result 2008-07-16 20:13:02 +0000
@@ -57,6 +57,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -111,6 +113,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -165,6 +169,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -220,6 +226,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -275,6 +283,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -329,6 +339,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -384,6 +396,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -439,6 +453,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -525,6 +541,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -580,6 +598,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -634,6 +654,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -688,6 +710,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@@ -743,6 +767,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
=== modified file 'mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result'
--- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result 2008-07-09 07:12:43 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result 2008-07-16 20:29:46 +0000
@@ -56,4 +56,6 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1146
Last_SQL_Error Error 'Table 'test.t1' doesn't exist' on opening tables
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
drop table t1, t2;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result 2008-04-02 13:14:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result 2008-07-16 20:13:02 +0000
@@ -288,6 +288,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2008-04-01 15:13:57 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2008-07-16 20:13:02 +0000
@@ -288,6 +288,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result 2008-02-12 10:27:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result 2008-07-16 20:13:02 +0000
@@ -62,6 +62,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 2
#
@@ -110,6 +112,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 3: max_relay_log_size = 0
#
@@ -158,6 +162,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@@ -203,6 +209,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 5
#
@@ -249,6 +257,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@@ -293,6 +303,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
=== modified file 'mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2008-02-05 13:30:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2008-07-16 20:13:02 +0000
@@ -43,6 +43,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@@ -84,6 +86,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -124,6 +128,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
change master to master_user='root';
start slave;
SHOW SLAVE STATUS;
@@ -165,6 +171,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
reset slave;
start slave;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2008-02-12 10:31:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2008-07-16 20:13:02 +0000
@@ -144,6 +144,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@@ -195,6 +197,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@@ -236,6 +240,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@@ -279,6 +285,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -322,6 +330,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -364,6 +374,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2008-02-12 10:31:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2008-07-16 20:13:02 +0000
@@ -144,6 +144,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@@ -195,6 +197,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@@ -236,6 +240,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@@ -279,6 +285,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -322,6 +330,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -364,6 +374,8 @@ Last_IO_Errno 0
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;
=== modified file 'mysql-test/suite/rpl/r/rpl_server_id2.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id2.result 2008-02-03 09:00:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id2.result 2008-07-16 20:13:02 +0000
@@ -47,6 +47,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave;
insert into t1 values (1);
select * from t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_skip_error.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result 2008-03-14 17:14:48 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result 2008-07-16 20:13:02 +0000
@@ -70,6 +70,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
==== Clean Up ====
drop table t1;
create table t1(a int primary key);
@@ -126,5 +128,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
==== Clean Up ====
drop table t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_slave_skip.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_skip.result 2008-04-02 13:14:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result 2008-07-16 20:13:02 +0000
@@ -82,6 +82,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@@ -146,6 +148,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
**** On Master ****
DROP TABLE t1, t2;
SET SESSION BINLOG_FORMAT=ROW;
=== modified file 'mysql-test/suite/rpl/r/rpl_ssl1.result'
--- a/mysql-test/suite/rpl/r/rpl_ssl1.result 2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ssl1.result 2008-07-16 20:13:02 +0000
@@ -57,6 +57,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
change master to master_user='root',master_password='', master_ssl=0;
start slave;
@@ -101,6 +103,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
change master to
master_host="localhost",
@@ -155,4 +159,6 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
drop table t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-02-12 10:27:52 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result 2008-07-16 20:13:02 +0000
@@ -270,6 +270,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result 2008-01-14 07:38:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result 2008-07-16 20:13:02 +0000
@@ -60,6 +60,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 2
#
@@ -108,6 +110,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 3: max_relay_log_size = 0
#
@@ -156,6 +160,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@@ -201,6 +207,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 5
#
@@ -247,6 +255,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@@ -291,6 +301,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2008-02-05 13:30:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2008-07-16 20:13:02 +0000
@@ -43,6 +43,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@@ -84,6 +86,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -124,6 +128,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
change master to master_user='root';
start slave;
SHOW SLAVE STATUS;
@@ -165,6 +171,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
stop slave;
reset slave;
start slave;
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_until.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result 2008-02-05 13:30:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result 2008-07-16 20:13:02 +0000
@@ -58,6 +58,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
select * from t1;
n
@@ -104,6 +106,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave until relay_log_file='slave-relay-bin.000003', relay_log_pos=746;
select * from t2;
n
@@ -148,6 +152,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=776;
@@ -190,6 +196,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
=== modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result 2008-02-06 17:31:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result 2008-07-16 20:13:02 +0000
@@ -78,6 +78,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Replicate_Ignore_Server_Ids
+Master_Server_Id 1
DROP TABLE t1;
**** On Master ****
DROP TABLE t1;
=== modified file 'sql/lex.h'
--- a/sql/lex.h 2008-07-09 07:12:43 +0000
+++ b/sql/lex.h 2008-07-16 20:29:46 +0000
@@ -245,6 +245,7 @@ static SYMBOL symbols[] = {
{ "IDENTIFIED", SYM(IDENTIFIED_SYM)},
{ "IF", SYM(IF)},
{ "IGNORE", SYM(IGNORE_SYM)},
+ { "IGNORE_SERVER_IDS", SYM(IGNORE_SERVER_IDS_SYM)},
{ "IMPORT", SYM(IMPORT)},
{ "IN", SYM(IN_SYM)},
{ "INDEX", SYM(INDEX_SYM)},
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc 2008-03-14 22:21:29 +0000
+++ b/sql/rpl_mi.cc 2008-07-16 20:13:02 +0000
@@ -28,17 +28,19 @@ int init_intvar_from_file(int* var, IO_C
int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
const char *default_val);
int init_floatvar_from_file(float* var, IO_CACHE* f, float default_val);
+int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f);
Master_info::Master_info()
:Slave_reporting_capability("I/O"),
ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), port(MYSQL_PORT),
connect_retry(DEFAULT_CONNECT_RETRY), heartbeat_period(0),
- received_heartbeats(0), inited(0),
+ received_heartbeats(0), inited(0), master_id(0),
abort_slave(0), slave_running(0), slave_run_id(0)
{
host[0] = 0; user[0] = 0; password[0] = 0;
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
ssl_cipher[0]= 0; ssl_key[0]= 0;
+ my_init_dynamic_array(&ignore_server_ids, sizeof(::server_id), 16, 16);
bzero((char*) &file, sizeof(file));
pthread_mutex_init(&run_lock, MY_MUTEX_INIT_FAST);
@@ -50,6 +52,7 @@ Master_info::Master_info()
Master_info::~Master_info()
{
+ delete_dynamic(&ignore_server_ids);
pthread_mutex_destroy(&run_lock);
pthread_mutex_destroy(&data_lock);
pthread_cond_destroy(&data_cond);
@@ -57,6 +60,43 @@ Master_info::~Master_info()
pthread_cond_destroy(&stop_cond);
}
+/**
+ A comparison function to be supplied as argument to @c sort_dynamic()
+ and @c bsearch()
+
+ @return -1 if first argument is less, 0 if it equal to, 1 if it is greater
+ than the second
+*/
+int server_id_cmp(ulong *id1, ulong *id2)
+{
+ return *id1 < *id2? -1 : (*id1 > *id2? 1 : 0);
+}
+
+
+/**
+ Reports if the s_id server has been configured to ignore events
+ it generates with
+
+ CHANGE MASTER IGNORE_SERVER_IDS= ( list of server ids )
+
+ Method is called from the io thread event receiver filtering.
+
+ @param s_id the master server identifier
+
+ @retval TRUE if s_id is in the list of ignored master servers,
+ @retval FALSE otherwise.
+ */
+bool Master_info::shall_ignore_server_id(ulong s_id)
+{
+ if (likely(ignore_server_ids.elements == 1))
+ return (* (ulong*) dynamic_array_ptr(&ignore_server_ids, 0)) == s_id;
+ else
+ return bsearch((const ulong *) &s_id,
+ ignore_server_ids.buffer,
+ ignore_server_ids.elements, sizeof(ulong),
+ (int (*) (const void*, const void*)) server_id_cmp)
+ != NULL;
+}
void init_master_log_pos(Master_info* mi)
{
@@ -87,8 +127,11 @@ enum {
/* 6.0 added value of master_heartbeat_period */
LINE_FOR_MASTER_HEARTBEAT_PERIOD= 16,
+ /* 6.0 added value of master_ignore_server_id */
+ LINE_FOR_REPLICATE_IGNORE_SERVER_IDS= 17,
+
/* Number of lines currently used when saving master info file */
- LINES_IN_MASTER_INFO= LINE_FOR_MASTER_HEARTBEAT_PERIOD
+ LINES_IN_MASTER_INFO= LINE_FOR_REPLICATE_IGNORE_SERVER_IDS
};
@@ -280,6 +323,17 @@ file '%s')", fname);
if (lines >= LINE_FOR_MASTER_HEARTBEAT_PERIOD &&
init_floatvar_from_file(&master_heartbeat_period, &mi->file, 0.0))
goto errwithmsg;
+ /*
+ Starting from 6.0 list of server_id of ignorable servers might be
+ in the file
+ */
+ if (lines >= LINE_FOR_REPLICATE_IGNORE_SERVER_IDS &&
+ init_dynarray_intvar_from_file(&mi->ignore_server_ids, &mi->file))
+ {
+ sql_print_error("Failed to initialize master info ignore_server_ids");
+ goto errwithmsg;
+ }
+
}
#ifndef HAVE_OPENSSL
@@ -379,16 +433,40 @@ int flush_master_info(Master_info* mi, b
*/
char heartbeat_buf[sizeof(mi->heartbeat_period) * 4]; // buffer to suffice always
my_sprintf(heartbeat_buf, (heartbeat_buf, "%.3f", mi->heartbeat_period));
+ /*
+ produce a line listing the total number and all the ignored server_id:s
+ */
+ char* ignore_server_ids_buf;
+ {
+ ignore_server_ids_buf=
+ (char *) my_malloc((sizeof(::server_id) * 3 + 1) *
+ (1 + mi->ignore_server_ids.elements), MYF(MY_WME));
+ if (!ignore_server_ids_buf)
+ DBUG_RETURN(1);
+ for (ulong i= 0, cur_len= my_sprintf(ignore_server_ids_buf,
+ (ignore_server_ids_buf, "%u",
+ mi->ignore_server_ids.elements));
+ i < mi->ignore_server_ids.elements; i++)
+ {
+ ulong s_id;
+ get_dynamic(&mi->ignore_server_ids, (uchar*) &s_id, i);
+ cur_len +=my_sprintf(ignore_server_ids_buf + cur_len,
+ (ignore_server_ids_buf + cur_len,
+ " %lu", s_id));
+ }
+ }
my_b_seek(file, 0L);
my_b_printf(file,
- "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n",
+ "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n%s\n",
LINES_IN_MASTER_INFO,
mi->master_log_name, llstr(mi->master_log_pos, lbuf),
mi->host, mi->user,
mi->password, mi->port, mi->connect_retry,
(int)(mi->ssl), mi->ssl_ca, mi->ssl_capath, mi->ssl_cert,
mi->ssl_cipher, mi->ssl_key, mi->ssl_verify_server_cert,
- heartbeat_buf);
+ heartbeat_buf,
+ ignore_server_ids_buf);
+ my_free(ignore_server_ids_buf, MYF(0));
DBUG_RETURN(-flush_io_cache(file));
}
=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h 2008-02-03 09:00:49 +0000
+++ b/sql/rpl_mi.h 2008-07-16 20:13:02 +0000
@@ -20,6 +20,7 @@
#include "rpl_rli.h"
#include "rpl_reporting.h"
+#include "my_sys.h"
/*****************************************************************************
@@ -60,6 +61,7 @@ class Master_info : public Slave_reporti
public:
Master_info();
~Master_info();
+ bool shall_ignore_server_id(ulong s_id);
/* the variables below are needed because we can change masters on the fly */
char master_log_name[FN_REFLEN];
@@ -85,10 +87,12 @@ class Master_info : public Slave_reporti
uint connect_retry;
float heartbeat_period; // interface with CHANGE MASTER or master.info
ulonglong received_heartbeats; // counter of received heartbeat events
+ DYNAMIC_ARRAY ignore_server_ids;
#ifndef DBUG_OFF
int events_till_disconnect;
#endif
bool inited;
+ ulong master_id;
volatile bool abort_slave;
volatile uint slave_running;
volatile ulong slave_run_id;
@@ -111,6 +115,7 @@ int init_master_info(Master_info* mi, co
int thread_mask);
void end_master_info(Master_info* mi);
int flush_master_info(Master_info* mi, bool flush_relay_log_cache);
+int server_id_cmp(ulong *id1, ulong *id2);
#endif /* HAVE_REPLICATION */
#endif /* RPL_MI_H */
=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt 2008-07-09 07:12:43 +0000
+++ b/sql/share/errmsg.txt 2008-07-16 20:29:46 +0000
@@ -6261,6 +6261,8 @@ ER_SLAVE_HEARTBEAT_FAILURE
eng "Unexpected master's heartbeat data: %s"
ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
eng "The requested value for the heartbeat period %s %s"
+ER_SLAVE_IGNORE_SERVER_IDS
+ eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
ER_BACKUP_CANT_FIND_SE
eng "Backup image contains data created by a native driver of %-.64s storage engine but this engine can not be found on this server"
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc 2008-07-10 23:29:27 +0000
+++ b/sql/slave.cc 2008-07-16 20:13:02 +0000
@@ -759,6 +759,94 @@ int init_floatvar_from_file(float* var,
DBUG_RETURN(1);
}
+/**
+ A master info read method
+
+ This function is called from @c init_master_info() along with
+ init_{type}_from_file relatives to restore some of @c active_mi members.
+ Particularly, this function is responsible for restoring
+ IGNORE_SERVER_IDS list of servers whose events the slave is
+ going to ignore (to not log them in the relay log).
+ Items being read are supposed to be decimal output of values of a
+ type shorter or equal of @c long and separated by the single space.
+
+ @param arr @c DYNAMIC_ARRAY pointer to storage for servers id
+ @param f @c IO_CACHE pointer to the source file
+
+ @retval 0 All OK
+ @retval non-zero An error
+*/
+
+int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f)
+{
+ int ret= 0;
+ char buf[16 * (sizeof(long)*4 + 1)]; // static buffer to use most of times
+ char *buf_act= buf; // actual buffer can be dynamic if static is short
+ char *token, *last;
+ uint num_items; // number of items of `arr'
+ size_t read_size;
+ DBUG_ENTER("init_dynarray_intvar_from_file");
+
+ if ((read_size= my_b_gets(f, buf_act, sizeof(buf))) == 0)
+ {
+ return 0; // no line in master.info
+ }
+ if (read_size + 1 == sizeof(buf) && buf[sizeof(buf) - 2] != '\n')
+ {
+ /*
+ short read happend; allocate sufficient memory and make the 2nd read
+ */
+ char buf_work[(sizeof(long)*3 + 1)*16];
+ memcpy(buf_work, buf, sizeof(buf_work));
+ num_items= atoi(strtok_r(buf_work, " ", &last));
+ size_t snd_size;
+ /*
+ max size lower bound approximate estimation bases on the formula:
+ (the items number + items themselves) *
+ (decimal size + space) - 1 + `\n' + '\0'
+ */
+ size_t max_size= (1 + num_items) * (sizeof(long)*3 + 1) + 1;
+ buf_act= (char*) my_malloc(max_size, MYF(MY_WME));
+ memcpy(buf_act, buf, read_size);
+ snd_size= my_b_gets(f, buf_act + read_size, max_size - read_size);
+ if (snd_size == 0 ||
+ (snd_size + 1 == max_size - read_size) && buf[max_size - 2] != '\n')
+ {
+ /*
+ failure to make the 2nd read or short read again
+ */
+ ret= 1;
+ goto err;
+ }
+ }
+ token= strtok_r(buf_act, " ", &last);
+ if (token == NULL)
+ {
+ ret= 1;
+ goto err;
+ }
+ num_items= atoi(token);
+ for (uint i=0; i < num_items; i++)
+ {
+ token= strtok_r(NULL, " ", &last);
+ if (token == NULL)
+ {
+ ret= 1;
+ goto err;
+ }
+ else
+ {
+ ulong val= atol(token);
+ insert_dynamic(arr, (uchar *) &val);
+ }
+ }
+err:
+ if (buf_act != buf)
+ my_free(buf_act, MYF(0));
+ DBUG_RETURN(ret);
+}
+
+
static bool check_io_slave_killed(THD *thd, Master_info *mi, const char *info)
{
if (io_slave_killed(thd, mi))
@@ -907,7 +995,7 @@ static int get_master_version_and_clock(
(master_res= mysql_store_result(mysql)))
{
if ((master_row= mysql_fetch_row(master_res)) &&
- (::server_id == strtoul(master_row[1], 0, 10)) &&
+ (::server_id == (mi->master_id= strtoul(master_row[1], 0, 10))) &&
!mi->rli.replicate_same_server_id)
{
errmsg=
@@ -923,7 +1011,14 @@ static int get_master_version_and_clock(
if (errmsg)
goto err;
}
-
+ if (mi->master_id == 0 && mi->ignore_server_ids.elements > 0)
+ {
+ errmsg="Slave configured with server id filtering could not detect the master server id.";
+ err_code= ER_SLAVE_FATAL_ERROR;
+ sprintf(err_buff, ER(err_code), errmsg);
+ err_msg.append(err_buff);
+ goto err;
+ }
/*
Check that the master's global character_set_server and ours are the same.
Not fatal if query fails (old master?).
@@ -1239,6 +1334,10 @@ bool show_master_info(THD* thd, Master_i
field_list.push_back(new Item_empty_string("Last_IO_Error", 20));
field_list.push_back(new Item_return_int("Last_SQL_Errno", 4, MYSQL_TYPE_LONG));
field_list.push_back(new Item_empty_string("Last_SQL_Error", 20));
+ field_list.push_back(new Item_empty_string("Replicate_Ignore_Server_Ids",
+ FN_REFLEN));
+ field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong),
+ MYSQL_TYPE_LONG));
if (protocol->send_fields(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
@@ -1358,6 +1457,32 @@ bool show_master_info(THD* thd, Master_i
protocol->store(mi->rli.last_error().number);
// Last_SQL_Error
protocol->store(mi->rli.last_error().message, &my_charset_bin);
+ // Replicate_Ignore_Server_Ids
+ {
+ char buff[FN_REFLEN];
+ ulong i, cur_len;
+ for (i= 0, buff[0]= 0, cur_len= 0;
+ i < mi->ignore_server_ids.elements; i++)
+ {
+ ulong s_id, slen;
+ char sbuff[FN_REFLEN];
+ get_dynamic(&mi->ignore_server_ids, (uchar*) &s_id, i);
+ slen= my_sprintf(sbuff, (sbuff, (i==0? "%lu" : ", %lu"), s_id));
+ if (cur_len + slen + 4 > FN_REFLEN)
+ {
+ /*
+ break the loop whenever remained space could not fit
+ ellipses on the next cycle
+ */
+ my_sprintf(buff + cur_len, (buff + cur_len, "..."));
+ break;
+ }
+ cur_len += my_sprintf(buff + cur_len, (buff + cur_len, "%s", sbuff));
+ }
+ protocol->store(buff, &my_charset_bin);
+ }
+ // Master_Server_id
+ protocol->store((uint32) mi->master_id);
pthread_mutex_unlock(&mi->rli.data_lock);
pthread_mutex_unlock(&mi->data_lock);
@@ -3070,6 +3195,7 @@ static int queue_event(Master_info* mi,c
ulong inc_pos;
Relay_log_info *rli= &mi->rli;
pthread_mutex_t *log_lock= rli->relay_log.get_log_lock();
+ ulong s_id;
DBUG_ENTER("queue_event");
LINT_INIT(inc_pos);
@@ -3216,9 +3342,20 @@ static int queue_event(Master_info* mi,c
*/
pthread_mutex_lock(log_lock);
-
- if ((uint4korr(buf + SERVER_ID_OFFSET) == ::server_id) &&
- !mi->rli.replicate_same_server_id)
+ s_id= uint4korr(buf + SERVER_ID_OFFSET);
+ if ((s_id == ::server_id && !mi->rli.replicate_same_server_id) ||
+ /*
+ the following conjunction deals with IGNORE_SERVER_IDS, if set
+ If the master is on the ignore list, execution of
+ format description log events and rotate events is necessary.
+ */
+ (mi->ignore_server_ids.elements > 0 &&
+ mi->shall_ignore_server_id(s_id) &&
+ /* everything is filtered out from non-master */
+ (s_id != mi->master_id ||
+ /* for the master meta information is necessary */
+ buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+ buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT)))
{
/*
Do not write it to the relay log.
@@ -3233,10 +3370,14 @@ static int queue_event(Master_info* mi,c
But events which were generated by this slave and which do not exist in
the master's binlog (i.e. Format_desc, Rotate & Stop) should not increment
mi->master_log_pos.
- */
- if (buf[EVENT_TYPE_OFFSET]!=FORMAT_DESCRIPTION_EVENT &&
- buf[EVENT_TYPE_OFFSET]!=ROTATE_EVENT &&
- buf[EVENT_TYPE_OFFSET]!=STOP_EVENT)
+ If the event is originated remotely and is being filtered out by
+ IGNORE_SERVER_IDS it increments mi->master_log_pos
+ as well as rli->group_relay_log_pos.
+ */
+ if (!(s_id == ::server_id && !mi->rli.replicate_same_server_id) ||
+ buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
+ buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT &&
+ buf[EVENT_TYPE_OFFSET] != STOP_EVENT)
{
mi->master_log_pos+= inc_pos;
memcpy(rli->ign_master_log_name_end, mi->master_log_name, FN_REFLEN);
@@ -3244,8 +3385,8 @@ static int queue_event(Master_info* mi,c
rli->ign_master_log_pos_end= mi->master_log_pos;
}
rli->relay_log.signal_update(); // the slave SQL thread needs to re-check
- DBUG_PRINT("info", ("master_log_pos: %lu, event originating from the same server, ignored",
- (ulong) mi->master_log_pos));
+ DBUG_PRINT("info", ("master_log_pos: %lu, event originating from %u server, ignored",
+ (ulong) mi->master_log_pos, uint4korr(buf + SERVER_ID_OFFSET)));
}
else
{
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h 2008-06-25 13:30:04 +0000
+++ b/sql/sql_lex.h 2008-07-16 20:29:46 +0000
@@ -206,10 +206,11 @@ typedef struct st_lex_master_info
changed variable or if it should be left at old value
*/
enum {LEX_MI_UNCHANGED, LEX_MI_DISABLE, LEX_MI_ENABLE}
- ssl, ssl_verify_server_cert, heartbeat_opt;
+ ssl, ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt;
char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
char *relay_log_name;
ulong relay_log_pos;
+ DYNAMIC_ARRAY repl_ignore_server_ids;
} LEX_MASTER_INFO;
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2008-07-09 07:12:43 +0000
+++ b/sql/sql_repl.cc 2008-07-16 20:29:46 +0000
@@ -1189,32 +1189,32 @@ void kill_zombie_dump_threads(uint32 sla
}
}
-
bool change_master(THD* thd, Master_info* mi)
{
int thread_mask;
const char* errmsg= 0;
bool need_relay_log_purge= 1;
+ bool ret= FALSE;
DBUG_ENTER("change_master");
lock_slave_threads(mi);
init_thread_mask(&thread_mask,mi,0 /*not inverse*/);
+ LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
if (thread_mask) // We refuse if any slave thread is running
{
my_message(ER_SLAVE_MUST_STOP, ER(ER_SLAVE_MUST_STOP), MYF(0));
- unlock_slave_threads(mi);
- DBUG_RETURN(TRUE);
+ ret= TRUE;
+ goto err;
}
thd_proc_info(thd, "Changing master");
- LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
// TODO: see if needs re-write
if (init_master_info(mi, master_info_file, relay_log_info_file, 0,
thread_mask))
{
my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
- unlock_slave_threads(mi);
- DBUG_RETURN(TRUE);
+ ret= TRUE;
+ goto err;
}
/*
@@ -1259,6 +1259,34 @@ bool change_master(THD* thd, Master_info
mi->heartbeat_period= (float) min(SLAVE_MAX_HEARTBEAT_PERIOD,
(slave_net_timeout/2.0));
mi->received_heartbeats= LL(0); // counter lives until master is CHANGEd
+ /*
+ reset the last time server_id list if the current CHANGE MASTER
+ is mentioning IGNORE_SERVER_IDS= (...)
+ */
+ if (lex_mi->repl_ignore_server_ids_opt == LEX_MASTER_INFO::LEX_MI_ENABLE)
+ reset_dynamic(&mi->ignore_server_ids);
+ for (uint i= 0; i < lex_mi->repl_ignore_server_ids.elements; i++)
+ {
+ ulong s_id;
+ get_dynamic(&lex_mi->repl_ignore_server_ids, (uchar*) &s_id, i);
+ if (s_id == ::server_id && replicate_same_server_id)
+ {
+ my_error(ER_SLAVE_IGNORE_SERVER_IDS, MYF(0), s_id);
+ ret= TRUE;
+ goto err;
+ }
+ else
+ {
+ if (bsearch((const ulong *) &s_id,
+ mi->ignore_server_ids.buffer,
+ mi->ignore_server_ids.elements, sizeof(ulong),
+ (int (*) (const void*, const void*))
+ server_id_cmp) == NULL)
+ insert_dynamic(&mi->ignore_server_ids, (uchar*) &s_id);
+ }
+ }
+ sort_dynamic(&mi->ignore_server_ids, (qsort_cmp) server_id_cmp);
+
if (lex_mi->ssl != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::LEX_MI_ENABLE);
@@ -1336,8 +1364,8 @@ bool change_master(THD* thd, Master_info
if (flush_master_info(mi, 0))
{
my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush master info file");
- unlock_slave_threads(mi);
- DBUG_RETURN(TRUE);
+ ret= TRUE;
+ goto err;
}
if (need_relay_log_purge)
{
@@ -1348,8 +1376,8 @@ bool change_master(THD* thd, Master_info
&errmsg))
{
my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg);
- unlock_slave_threads(mi);
- DBUG_RETURN(TRUE);
+ ret= TRUE;
+ goto err;
}
}
else
@@ -1364,8 +1392,8 @@ bool change_master(THD* thd, Master_info
&msg, 0))
{
my_error(ER_RELAY_LOG_INIT, MYF(0), msg);
- unlock_slave_threads(mi);
- DBUG_RETURN(TRUE);
+ ret= TRUE;
+ goto err;
}
}
/*
@@ -1402,10 +1430,13 @@ bool change_master(THD* thd, Master_info
pthread_cond_broadcast(&mi->data_cond);
pthread_mutex_unlock(&mi->rli.data_lock);
+err:
unlock_slave_threads(mi);
thd_proc_info(thd, 0);
- my_ok(thd);
- DBUG_RETURN(FALSE);
+ if (ret == FALSE)
+ my_ok(thd);
+ delete_dynamic(&lex_mi->repl_ignore_server_ids); //freeing of parser-time alloc
+ DBUG_RETURN(ret);
}
int reset_master(THD* thd)
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy 2008-07-14 14:56:49 +0000
+++ b/sql/sql_yacc.yy 2008-07-16 20:29:46 +0000
@@ -818,6 +818,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
%token IDENT_QUOTED
%token IF
%token IGNORE_SYM
+%token IGNORE_SERVER_IDS_SYM
%token IMPORT
%token INDEXES
%token INDEX_SYM
@@ -1670,6 +1671,13 @@ change:
LEX *lex = Lex;
lex->sql_command = SQLCOM_CHANGE_MASTER;
bzero((char*) &lex->mi, sizeof(lex->mi));
+ /*
+ resetting flags that can left from the previous CHANGE MASTER
+ */
+ lex->mi.heartbeat_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
+ lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
+ my_init_dynamic_array(&Lex->mi.repl_ignore_server_ids,
+ sizeof(::server_id), 16, 16);
}
master_defs
{}
@@ -1770,10 +1778,27 @@ master_def:
}
Lex->mi.heartbeat_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
}
+ | IGNORE_SERVER_IDS_SYM EQ '(' ignore_server_id_list ')'
+ {
+ Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
+ }
|
master_file_def
;
+ignore_server_id_list:
+ /* Empty */
+ | ignore_server_id
+ | ignore_server_id_list ',' ignore_server_id
+ ;
+
+ignore_server_id:
+ ulong_num
+ {
+ insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
+ }
+ ;
+
master_file_def:
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
{
| Thread |
|---|
| • bzr push into mysql-6.0-backup branch (aelkin:2672 to 2718) Bug#37627,Bug#25998, Bug#20748, Bug#37481, Bug#37997, Bug#37076, Bug#35848, Bug#27808 | Andrei Elkin | 16 Jul |
