database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge tag 'mariadb-10.0.20' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-06-27 20:35:26 +02:00
parent fe7e334f3e a6087e7dc1
commit 658992699b
390 changed files with 7206 additions and 4474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_partition_admin.cc
View File

@ -837,9 +837,16 @@ bool Sql_cmd_alter_table_truncate_partition::execute(THD *thd)
log. The exception is a unimplemented truncate method or failure
before any call to handler::truncate() is done.
Also, it is logged in statement format, regardless of the binlog format.
Since we've changed data within the table, we also have to invalidate
the query cache for it.
*/
if (error != HA_ERR_WRONG_COMMAND && binlog_stmt)
error|= write_bin_log(thd, !error, thd->query(), thd->query_length());
if (error != HA_ERR_WRONG_COMMAND)
{
query_cache_invalidate3(thd, first_table, FALSE);
if (binlog_stmt)
error|= write_bin_log(thd, !error, thd->query(), thd->query_length());
}
/*
A locked table ticket was upgraded to a exclusive lock. After the