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 mysql.com:/home/kostja/mysql/mysql-5.0-for_merge

Browse Source 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
This commit is contained in:
konstantin@mysql.com
2006-02-02 12:03:35 +03:00
parent bcb4178c73 88285b92f2
commit 065f8066d5
19 changed files with 366 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_handler.cc
View File

@ -422,12 +422,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
if (!lock)
goto err0; // mysql_lock_tables() printed error message already
if (cond && ((!cond->fixed &&
cond->fix_fields(thd, &cond)) || cond->check_cols(1)))
if (cond)
{
if (table->query_id != thd->query_id)
cond->cleanup(); // File was reopened
goto err0;
if ((!cond->fixed &&
cond->fix_fields(thd, &cond)) || cond->check_cols(1))
goto err0;
}
if (keyname)