diff options
author | unknown <monty@mashka.mysql.fi> | 2003-05-26 20:48:40 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-05-26 20:48:40 +0300 |
commit | da9bf1dec30f9d1cda414d0a96ca93c11b1a77e7 (patch) | |
tree | d114eefb7420ba742d8c275a4841b0c8aeedaeb0 /sql/sql_insert.cc | |
parent | 926add9c888941bb2d307cd325d10ffcf85a8775 (diff) | |
download | mariadb-git-da9bf1dec30f9d1cda414d0a96ca93c11b1a77e7.tar.gz |
ixed wrong unlock of tables (new bug)
sql/sql_delete.cc:
Comment cleanup
sql/sql_insert.cc:
Comment cleanup
sql/sql_load.cc:
Comment cleanup
sql/sql_update.cc:
Fixed wrong unlock of tables.
(Unlock must be done after writing to binary log
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 48cc6d4e254..1908f898a27 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -350,9 +350,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, before binlog writing and ha_autocommit_... */ if (info.copied || info.deleted) - { query_cache_invalidate3(thd, table_list, 1); - } transactional_table= table->file->has_transactions(); @@ -1424,9 +1422,7 @@ void select_insert::send_error(uint errcode,const char *err) table->file->extra(HA_EXTRA_NO_CACHE); table->file->activate_all_index(thd); if (info.copied || info.deleted) - { query_cache_invalidate3(thd, table, 1); - } ha_rollback_stmt(thd); } @@ -1438,13 +1434,13 @@ bool select_insert::send_eof() error=table->file->activate_all_index(thd); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); - /* We must invalidate the table in the query cache before binlog writing - and ha_autocommit_... */ + /* + We must invalidate the table in the query cache before binlog writing + and ha_autocommit_... + */ if (info.copied || info.deleted) - { query_cache_invalidate3(thd, table, 1); - } /* Write to binlog before commiting transaction */ if (mysql_bin_log.is_open()) |