diff options
author | monty@mashka.mysql.fi <> | 2002-11-25 12:19:28 +0200 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2002-11-25 12:19:28 +0200 |
commit | 5dbea1b7a26ca1b171546d1ad042113af5d9bd74 (patch) | |
tree | af2db8bb2a2a932f016529fbf7508121528d132a /sql/sql_insert.cc | |
parent | 96212cc300843e6509fbf38083f902f8aebece2a (diff) | |
parent | 05c732e7796f54a5d7facf0adf5f1bbf592b7ecf (diff) | |
download | mariadb-git-5dbea1b7a26ca1b171546d1ad042113af5d9bd74.tar.gz |
Merge with 4.0
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 6cb146afb33..c8a29dcd8da 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -319,13 +319,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, error=ha_autocommit_or_rollback(thd,error); /* - Only invalidate the query cache if something changed or if we - didn't commit the transacion (query cache is automaticly - invalidated on commit) + Store table for future invalidation or invalidate it in + the query cache if something changed */ - if ((info.copied || info.deleted) && - (!transactional_table || - thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) + if (info.copied || info.deleted) { query_cache_invalidate3(thd, table_list, 1); } |