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


client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
sql/sql_yacc.yy:
  Manual merge: resolve the conflict with moved sp_if rule
This commit is contained in:
unknown
2006-02-02 12:03:35 +03:00
parent 7088b39da8 13f908c23e
commit f0263ac452
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)