1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge bk@192.168.21.1:mysql-5.0

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none)
2007-03-22 12:21:06 +04:00
18 changed files with 272 additions and 47 deletions

View File

@ -4865,6 +4865,7 @@ bool setup_tables_and_check_access(THD *thd,
TABLE_LIST *leaves_tmp = NULL;
bool first_table= true;
thd->leaf_count= 0;
if (setup_tables (thd, context, from_clause, tables, conds,
&leaves_tmp, select_insert))
return TRUE;
@ -4882,6 +4883,7 @@ bool setup_tables_and_check_access(THD *thd,
return TRUE;
}
first_table= false;
thd->leaf_count++;
}
return FALSE;
}