diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-17 19:32:14 +0100 |
| commit | d8d639b39e2d177d6dc7ee519326d1d3944e0d53 (patch) | |
| tree | d02a2237b2c459c7c03d3e376cba150da65776c1 /sql/sql_load.cc | |
| parent | 5d92d2d7cf4ba64bdd9eed8d843221a4a476915d (diff) | |
| parent | 4c04fa4df2fc28e8037eaaed7a4d01d6ce0ab37d (diff) | |
| download | mariadb-git-d8d639b39e2d177d6dc7ee519326d1d3944e0d53.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
configure.in:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 81dd710dbcb..c1c775f95b7 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -464,7 +464,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, #ifndef EMBEDDED_LIBRARY if (mysql_bin_log.is_open()) { -#ifdef HAVE_ROW_BASED_REPLICATION /* We need to do the job that is normally done inside binlog_query() here, which is to ensure that the pending event @@ -476,7 +475,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (thd->current_stmt_binlog_row_based) thd->binlog_flush_pending_rows_event(true); else -#endif { /* As already explained above, we need to call end_io_cache() or the last |