diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:23:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:25:35 +0300 |
| commit | be33124c9dc284c4409d02e5405de568b467a167 (patch) | |
| tree | 7188f6effdace66ce24af17fd1bd0d89f5b76999 /sql/sql_table.cc | |
| parent | fe8181aca13cf7ba1835fa6c89f297a1d0e79856 (diff) | |
| parent | 15c1ab52a9f2827724c5d007ce7b8c607dc8f0a9 (diff) | |
| download | mariadb-git-be33124c9dc284c4409d02e5405de568b467a167.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index fbd6622b1b2..41f62de2a70 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5115,7 +5115,7 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table, err: /* In RBR we don't need to log CREATE TEMPORARY TABLE */ - if (thd->is_current_stmt_binlog_format_row() && create_info->tmp_table()) + if (!result && thd->is_current_stmt_binlog_format_row() && create_info->tmp_table()) DBUG_RETURN(result); if (create_info->tmp_table()) |