diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
| commit | b34c8645cdb301140327528a76a79a9e68c25611 (patch) | |
| tree | cb49384a1f2715f859ecea334f20bf4a46ecbcce /sql/sql_insert.cc | |
| parent | 7772c7cd945cf674b212b82f4d156099c67344a2 (diff) | |
| parent | 65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (diff) | |
| download | mariadb-git-b-10.3-10.3-merge.tar.gz | |
Merge 10.3 into 10.4b-10.3-10.3-merge
Conflicts:
mysql-test/suite/galera/disabled.def (resolved)
mysql-test/suite/galera/r/MW-328A.result (run tests)
mysql-test/suite/innodb/r/alter_copy.result (needs check)
mysql-test/suite/innodb/t/trx_id_future.test (needs check)
sql/opt_range.cc (needs check)
sql/share/errmsg-utf8.txt (needs check)
sql/sql_parse.cc (needs check)
sql/sql_select.cc (needs check)
sql/sql_table.cc (need check)
sql/wsrep_mysqld.cc (resolved)
sql/wsrep_sst.cc (resolved)
sql/wsrep_thd.cc (resolved)
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 8db6aac6846..7825a7742ef 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1061,6 +1061,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, break; } + thd->decide_logging_format_low(table); #ifndef EMBEDDED_LIBRARY if (lock_type == TL_WRITE_DELAYED) { |