database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

Browse Source 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
This commit is contained in:
ibabaev@bk-internal.mysql.com
2007-03-30 20:00:12 +02:00
parent b8e0d3490e 064157b6e8
commit 8c3525ff31
27 changed files with 472 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@@ -5838,7 +5838,6 @@ 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;
@@ -5856,7 +5855,6 @@ bool setup_tables_and_check_access(THD *thd,
return TRUE;
}
first_table= 0;
thd->leaf_count++;
}
return FALSE;
}