database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manual merge

Browse Source
This commit is contained in:
igor@rurik.mysql.com
2005-05-10 16:41:47 -07:00
parent 3c81444476 9d4b228b61
commit 3351233349
12 changed files with 77 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@@ -3169,10 +3169,8 @@ TABLE_LIST **make_leaves_list(TABLE_LIST **list, TABLE_LIST *tables)
{
for (TABLE_LIST *table= tables; table; table= table->next_local)
{
if (table->view && !table->table)
if (table->view && table->effective_algorithm == VIEW_ALGORITHM_MERGE)
{
/* it is for multi table views only, check it */
DBUG_ASSERT(table->ancestor->next_local != 0);
list= make_leaves_list(list, table->ancestor);
}
else