1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Merge bk@192.168.21.1:mysql-5.0-opt

into  mysql.com:/home/hf/work/mysql-5.0-0mrg
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none)
2006-11-17 10:30:16 +04:00
57 changed files with 1856 additions and 291 deletions

View File

@@ -3451,8 +3451,12 @@ end_with_restore_list:
if (first_table->lock_type == TL_WRITE_CONCURRENT_INSERT &&
thd->lock)
{
/* INSERT ... SELECT should invalidate only the very first table */
TABLE_LIST *save_table= first_table->next_local;
first_table->next_local= 0;
mysql_unlock_tables(thd, thd->lock);
query_cache_invalidate3(thd, first_table, 1);
first_table->next_local= save_table;
thd->lock=0;
}
delete result;