mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 00:24:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 4.1

Browse source
This commit is contained in:
monty@mishka.local 2004-12-22 13:54:39 +02:00
commit 4f4bbfc279
395 changed files with 11778 additions and 25504 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_help.cc
View file

@ -556,7 +556,8 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol,
SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, TABLE_LIST *tables,
TABLE *table, int *error)
{
cond->fix_fields(thd, tables, &cond); // can never fail
if (!cond->fixed)
cond->fix_fields(thd, tables, &cond); // can never fail
SQL_SELECT *res= make_select(table,0,0,cond,error);
if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)))
{