database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1

Browse Source 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


libmysqld/lib_sql.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2007-03-22 12:20:51 +04:00
parent 8ed9a54008 9f9e2f2df0
commit d152debde5
18 changed files with 289 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_base.cc
View File

@ -5772,11 +5772,13 @@ 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,
&leaves_tmp, select_insert))
return TRUE;
*leaves= leaves_tmp;
if (leaves)
*leaves= leaves_tmp;
for (; leaves_tmp; leaves_tmp= leaves_tmp->next_leaf)
{
@ -5788,6 +5790,7 @@ bool setup_tables_and_check_access(THD *thd,
return TRUE;
}
first_table= 0;
thd->leaf_count++;
}
return FALSE;
}