Post-merge fixes.

3377014a · mats@mysql.com · 588eee80 · 3377014a
Commit 3377014a authored Jan 04, 2006 by mats@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_class.cc sql/sql_class.cc +1 -1

No files found.
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1991,7 +1991,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
      INSERT INTO t1 VALUES (1), (foo()), (2);
  */
  if (binlog_row_based)
-    thd->binlog_flush_pending_rows_event(false);
+    binlog_flush_pending_rows_event(false);

  if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
      !binlog_row_based)