database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags

Browse Source 
into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1


mysql-test/suite/binlog/r/binlog_killed.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
  manual merge
sql/log.cc:
  manual merge
This commit is contained in:
unknown
2007-11-06 20:41:06 +02:00
parent febb420146 6957e84ec6
commit cb9af6f8a1
5 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/t/rpl_temporary.test
View File

@@ -208,8 +208,9 @@ select * from t1;
connection master;
drop table t1;
--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql
# Delete the anonymous users
source include/delete_anonymous_users.inc;
# End of 5.1 tests
# End of tests