2700 Mats Kindahl 2008-10-07
Added missing cleanup.
modified:
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/t/rpl_packet.test
2699 Mats Kindahl 2008-10-07 [merge]
Merging 6.0 into 6.0-rpl
removed:
mysql-test/suite/falcon/r/falcon_select_excerpt.result
mysql-test/suite/falcon/t/falcon_page_size_1-master.opt
mysql-test/suite/falcon/t/falcon_select_excerpt.test
mysql-test/suite/falcon_team/r/falcon_bug_22166.result
mysql-test/suite/falcon_team/r/falcon_bug_22187.result
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/falcon_bug_28006.result
mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_22166.test
mysql-test/suite/falcon_team/t/falcon_bug_22187.test
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/falcon_bug_28006.test
mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
sql/backup/backup_progress.cc
sql/backup/backup_progress.h
sql/replication.h
sql/rpl_handler.cc
sql/rpl_handler.h
added:
mysql-test/r/backup_blob.result
mysql-test/r/backup_logs_output.result
mysql-test/r/backup_securefilepriv.result
mysql-test/r/test_wl4435.result
mysql-test/suite/falcon/r/falcon_bug_22207-big.result
mysql-test/suite/falcon/r/falcon_bug_37668.result
mysql-test/suite/falcon/r/falcon_bug_38304.result
mysql-test/suite/falcon/r/falcon_bug_39692.result
mysql-test/suite/falcon/r/falcon_index_datatypes.result
mysql-test/suite/falcon/r/falcon_online_index.result
mysql-test/suite/falcon/t/falcon_bug_22207-big.test
mysql-test/suite/falcon/t/falcon_bug_37668.test
mysql-test/suite/falcon/t/falcon_bug_38304.test
mysql-test/suite/falcon/t/falcon_bug_39692.test
mysql-test/suite/falcon/t/falcon_index_datatypes.test
mysql-test/suite/falcon/t/falcon_online_index.test
mysql-test/suite/falcon_team/t/test2bug.def
mysql-test/t/backup_blob.test
mysql-test/t/backup_logs_output.test
mysql-test/t/backup_securefilepriv-master.opt
mysql-test/t/backup_securefilepriv.test
sql/records.h
sql/replication.h
sql/rpl_handler.cc
sql/rpl_handler.h
sql/si_logs.cc
sql/si_logs.h
sql/transaction.cc
sql/transaction.h
storage/falcon/SyncHandler.cpp
storage/falcon/SyncHandler.h
renamed:
mysql-test/r/backup_progress.result => mysql-test/r/backup_logs.result
mysql-test/suite/falcon_team/r/falcon_bug_22189.result => mysql-test/suite/falcon/r/falcon_bug_22189.result
mysql-test/suite/falcon_team/r/falcon_bug_22207.result => mysql-test/suite/falcon/r/falcon_bug_22207.result
mysql-test/suite/falcon_team/r/falcon_bug_23189.result => mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon_team/r/falcon_bug_24024.result => mysql-test/suite/falcon/r/falcon_bug_24024.result
mysql-test/suite/falcon_team/r/falcon_bug_30282.result => mysql-test/suite/falcon/r/falcon_bug_30282.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result => mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result => mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon_team/r/falcon_bug_30826.result => mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result => mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon_team/r/ps_8falcon.result => mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_22189.test => mysql-test/suite/falcon/t/falcon_bug_22189.test
mysql-test/suite/falcon_team/t/falcon_bug_22207.test => mysql-test/suite/falcon/t/falcon_bug_22207.test
mysql-test/suite/falcon_team/t/falcon_bug_23189.test => mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon_team/t/falcon_bug_24024.test => mysql-test/suite/falcon/t/falcon_bug_24024.test
mysql-test/suite/falcon_team/t/falcon_bug_30282.test => mysql-test/suite/falcon/t/falcon_bug_30282.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test => mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test => mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test => mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test => mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon_team/t/ps_8falcon.test => mysql-test/suite/falcon/t/ps_8falcon.test
mysql-test/t/backup_progress.test => mysql-test/t/backup_logs.test
modified:
.bzr-mysql/default.conf
.bzrignore
Makefile.am
client/Makefile.am
client/mysqldump.c
configure.in
extra/CMakeLists.txt
include/atomic/generic-msvc.h
include/mysql.h
include/mysql.h.pp
include/mysql_com.h
libmysql/client_settings.h
libmysql/libmysql.c
libmysql/libmysql.def
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
libmysqld/libmysqld.def
mysql-test/extra/rpl_tests/rpl_log.test
mysql-test/lib/mtr_report.pm
mysql-test/r/1st.result
mysql-test/r/backup_backupdir.result
mysql-test/r/backup_errors.result
mysql-test/r/backup_no_be.result
mysql-test/r/backup_tablespace.result
mysql-test/r/connect.result
mysql-test/r/events_bugs.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_db.result
mysql-test/r/log_state.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqlshow.result
mysql-test/r/ps.result
mysql-test/r/system_mysql_db.result
mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/falcon/r/falcon_bug_22972.result
mysql-test/suite/falcon/r/falcon_bug_34164.result
mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/falcon/t/falcon_bug_22972.test
mysql-test/suite/falcon_team/r/falcon_bug_23945.result
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/disabled.def
mysql-test/suite/falcon_team/t/falcon_bug_23945.test
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_tables.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/ndb/r/ndb_dd_dump.result
mysql-test/suite/ndb/t/ndb_dd_dump.test
mysql-test/suite/rpl/r/rpl_drop_view.result
mysql-test/suite/rpl/r/rpl_misc_functions.result
mysql-test/suite/rpl/r/rpl_ps.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_stm_log.result
mysql-test/suite/rpl/t/rpl_drop_view.test
mysql-test/suite/rpl/t/rpl_misc_functions.test
mysql-test/suite/rpl/t/rpl_ps.test
mysql-test/t/backup_backupdir.test
mysql-test/t/backup_errors.test
mysql-test/t/backup_no_be.test
mysql-test/t/events_bugs.test
mysql-test/t/log_state.test
mysql-test/t/mysqldump.test
mysql-test/t/ps.test
mysql-test/t/system_mysql_db_fix30020.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysys/stacktrace.c
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/CMakeLists.txt
sql/backup/Makefile.am
sql/backup/backup_kernel.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_snapshot.cc
sql/backup/data_backup.cc
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_transport.c
sql/debug_sync.cc
sql/events.cc
sql/field.cc
sql/field.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/lock.cc
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/log_event_old.h
sql/mysql_priv.h
sql/mysqld.cc
sql/procedure.h
sql/protocol.cc
sql/protocol.h
sql/records.cc
sql/repl_failsafe.cc
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_record.cc
sql/rpl_record.h
sql/rpl_rli.cc
sql/rpl_tblmap.cc
sql/rpl_tblmap.h
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/slave.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_cache.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_do.cc
sql/sql_error.cc
sql/sql_handler.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sql_yacc.yy
sql/structs.h
sql/table.cc
sql/table.h
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/Configuration.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/DeferredIndex.cpp
storage/falcon/DeferredIndexWalker.cpp
storage/falcon/Error.cpp
storage/falcon/IO.cpp
storage/falcon/IOx.h
storage/falcon/InfoTable.cpp
storage/falcon/InfoTable.h
storage/falcon/Makefile.am
storage/falcon/MemoryManager.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecoveryObjects.cpp
storage/falcon/SQLException.h
storage/falcon/SRLUpdateRecords.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/Statement.cpp
storage/falcon/StorageHandler.cpp
storage/falcon/StorageHandler.h
storage/falcon/StorageParameters.h
storage/falcon/StorageTable.cpp
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/Table.cpp
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/innobase/handler/ha_innodb.cc
storage/maria/CMakeLists.txt
storage/maria/ha_maria.cc
tests/mysql_client_test.c
mysql-test/r/backup_logs.result
mysql-test/suite/falcon/r/falcon_bug_22189.result
mysql-test/suite/falcon/r/falcon_bug_22207.result
mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_24024.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_22189.test
mysql-test/suite/falcon/t/falcon_bug_22207.test
mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_24024.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/ps_8falcon.test
mysql-test/t/backup_logs.test
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result 2008-08-04 14:30:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result 2008-10-07 14:26:14 +0000
@@ -72,3 +72,5 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
+drop table t1;
+drop table t1;
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test 2008-08-04 14:30:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test 2008-10-07 14:26:14 +0000
@@ -78,4 +78,10 @@ connection slave;
--replace_column 1 # 7 # 8 # 9 # 12 # 22 # 23 # 33 # 35 # 36 #
query_vertical show slave status;
+# Cleaning up
+connection master;
+drop table t1;
+connection slave;
+drop table t1;
+
# End of tests
| Thread |
|---|
| • bzr push into mysql-6.0-rpl branch (mats:2699 to 2700) | Mats Kindahl | 7 Oct |
