database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source 
Conflicts:

Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in sql/item_func.cc
This commit is contained in:
Alexey Kopytov
2010-03-22 16:28:51 +03:00
parent 5d407d0c1a a35418784b
commit 074583a730
20 changed files with 260 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_repl.cc
View File

@ -2003,7 +2003,6 @@ int log_loaded_block(IO_CACHE* file)
if (mysql_bin_log.write(&b))
DBUG_RETURN(1);
lf_info->wrote_create_file= 1;
DBUG_SYNC_POINT("debug_lock.created_file_event",10);
}
}
DBUG_RETURN(0);