diff options
| author | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-29 13:44:35 +0300 |
| commit | 77a70a0a24ce658a3ee55248cb2e76f84afc1b88 (patch) | |
| tree | aeb2314adbd714c7e2b032209bfd7914e3cfda3d /sql/sql_insert.cc | |
| parent | 6cad89775b4ed78c02c2fa9f3e49181f63b7fb65 (diff) | |
| parent | 5e04e2370f05bc42437f8be476eba9e204888b65 (diff) | |
| download | mariadb-git-77a70a0a24ce658a3ee55248cb2e76f84afc1b88.tar.gz | |
merge with 4.0.15
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 947205949f1..66af0298f3e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1448,6 +1448,8 @@ void select_insert::send_error(uint errcode,const char *err) table->file->has_transactions()); mysql_bin_log.write(&qinfo); } + if (!table->tmp_table) + thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; } if (info.copied || info.deleted) query_cache_invalidate3(thd, table, 1); @@ -1468,7 +1470,11 @@ bool select_insert::send_eof() */ if (info.copied || info.deleted) + { query_cache_invalidate3(thd, table, 1); + if (!(table->file->has_transactions() || table->tmp_table)) + thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; + } if (last_insert_id) thd->insert_id(last_insert_id); // For binary log |