1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Manually merged

This commit is contained in:
evgen@moonbone.local
2006-01-16 16:57:15 +03:00
33 changed files with 868 additions and 38 deletions

View File

@ -424,7 +424,11 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
if (cond && ((!cond->fixed &&
cond->fix_fields(thd, &cond)) || cond->check_cols(1)))
{
if (table->query_id != thd->query_id)
cond->cleanup(); // File was reopened
goto err0;
}
if (keyname)
{