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

Manual merge from mysql-trunk-merge.

Browse Source 
Conflicts:
  - include/my_no_pthread.h
  - mysql-test/r/sp-ucs2.result
  - sql/log.cc
  - sql/sql_acl.cc
  - sql/sql_yacc.yy
This commit is contained in:
Alexander Nozdrin
2009-12-16 21:02:21 +03:00
parent f0ae3168a3 efe6195858
commit 09942fe8e8
108 changed files with 3406 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_view.cc
View File

@ -1775,7 +1775,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;