diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2006-09-15 01:46:47 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2006-09-15 01:46:47 +0200 |
| commit | f2783c9217f154a22ba8a2958180190554883b02 (patch) | |
| tree | 113215b4a0f6b7ce13a759c6061bfdb8d210b085 /sql/log.cc | |
| parent | 6a490444a615b9fd8ee057f71c215175cd6eb4cc (diff) | |
| parent | dbf1feb170963a1e6afc5e3d3a47e91a316baece (diff) | |
| download | mariadb-git-f2783c9217f154a22ba8a2958180190554883b02.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
client/mysqldump.c:
Merge main->rpl
mysql-test/r/variables.result:
Merge main->rpl
mysql-test/t/disabled.def:
Merge main->rpl
mysql-test/t/mysqldump.test:
Merge main->rpl
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/log.cc b/sql/log.cc index 8a8262c174d..5f33a9585e9 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3171,7 +3171,7 @@ int MYSQL_BIN_LOG:: flush_and_set_pending_rows_event(THD *thd, Rows_log_event* event) { DBUG_ENTER("MYSQL_BIN_LOG::flush_and_set_pending_rows_event(event)"); - DBUG_ASSERT(thd->current_stmt_binlog_row_based && mysql_bin_log.is_open()); + DBUG_ASSERT(mysql_bin_log.is_open()); DBUG_PRINT("enter", ("event=%p", event)); int error= 0; @@ -3416,9 +3416,6 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info) } } } - /* Forget those values, for next binlogger: */ - thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 0; - thd->auto_inc_intervals_in_cur_stmt_for_binlog.empty(); } /* |