diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-22 16:28:51 +0300 |
| commit | 074583a730d62d616061f06e810c0dfdf4aeddcc (patch) | |
| tree | 1fef9d45dab47fa4d783abace538a791c958b006 /sql/sql_repl.cc | |
| parent | 5d407d0c1aa8a7cb5f18a5a26cb517f8b4eb84fa (diff) | |
| parent | a35418784bc35f5b6c461689c954bdcfbb4c9b33 (diff) | |
| download | mariadb-git-074583a730d62d616061f06e810c0dfdf4aeddcc.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in sql/item_func.cc
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 6d1b93ea9ea..cc2a2b1d443 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -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); |