summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@sun.com>2009-09-30 18:00:22 +0200
committerSven Sandberg <sven.sandberg@sun.com>2009-09-30 18:00:22 +0200
commit3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c (patch)
tree9294c1869671b21c13da2117df804e3a5b9a56a4 /sql/sql_load.cc
parentc7d32876f345785580a7cf286542ccf390b4e1fa (diff)
parentbfb1de9c065b6e9fd6b9fecb1c2db2b4475d3135 (diff)
downloadmariadb-git-3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c.tar.gz
merged fixes for BUG#39934 to 5.1-rpl+3
Also renamed current_stmt_binlog_row_based to current_stmt_binlog_format_row for consistency
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index b7f33d51335..ab5f3165974 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -529,7 +529,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
version for the binary log to mark that table maps are invalid
after this point.
*/
- if (thd->current_stmt_binlog_row_based)
+ if (thd->is_current_stmt_binlog_format_row())
thd->binlog_flush_pending_rows_event(true);
else
{