diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-27 02:44:41 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-27 02:44:41 +0200 |
| commit | 2700d28319bf29ee3957a357eaa102bcc72e1ac4 (patch) | |
| tree | 8a737a53b89e213741053e2d7b14013c4f8609a3 /sql/sql_load.cc | |
| parent | d164cbf20770565dc8674e5266beb2a8d88f748a (diff) | |
| parent | 1b337e01d5d0a97b3a66eb98bcad658cfecb65b6 (diff) | |
| download | mariadb-git-2700d28319bf29ee3957a357eaa102bcc72e1ac4.tar.gz | |
merge
sql/slave.cc:
Auto merged
Docs/manual.texi:
Merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 9bf3346e61d..de6d006a80e 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -241,6 +241,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, send_ok(&thd->net,info.copied+info.deleted,0L,name); mysql_update_log.write(thd,thd->query,thd->query_length); + if (!table->file->has_transactions()) + thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; if (!read_file_from_client) { ex->skip_lines = save_skip_lines; |