database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

merge from mysql-trunk-bugfixing

Browse Source
This commit is contained in:
Jon Olav Hauglid
2010-06-30 08:47:49 +02:00
parent cace7d3038 10e329c8e1
commit 2fe246329f
41 changed files with 2712 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_table.cc
View File

@@ -4886,6 +4886,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (wait_while_table_is_used(thd, table->table,
HA_EXTRA_PREPARE_FOR_RENAME))
goto err;
DEBUG_SYNC(thd, "after_admin_flush");
/* Flush entries in the query cache involving this table. */
query_cache_invalidate3(thd, table->table, 0);
/*
@@ -5153,7 +5154,11 @@ send_result_message:
{
if (table->table->s->tmp_table)
{
if (open_for_modify)
/*
If the table was not opened successfully, do not try to get
status information. (Bug#47633)
*/
if (open_for_modify && !open_error)
table->table->file->info(HA_STATUS_CONST);
}
else if (open_for_modify || fatal_error)