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

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexey Kopytov
2009-12-16 16:47:07 +03:00
parent a1218bb782 8f32ccff60
commit efe6195858
56 changed files with 1481 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_view.cc
View File

@@ -1772,7 +1772,7 @@ bool check_key_in_view(THD *thd, TABLE_LIST *view)
if (!fld->item->fixed && fld->item->fix_fields(thd, &fld->item))
{
thd->mark_used_columns= save_mark_used_columns;
return TRUE;
DBUG_RETURN(TRUE);
}
}
thd->mark_used_columns= save_mark_used_columns;