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

Merge moonbone.local:/work/tmp_merge-5.0-mysql

Browse Source 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
This commit is contained in:
evgen@moonbone.local
2006-08-29 18:58:50 +04:00
parent 002af6b5ea 7a55f7fac4
commit 8cf9781717
64 changed files with 1217 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_load.cc
View File

@ -156,6 +156,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
&thd->lex->select_lex.top_join_list,
table_list,
&thd->lex->select_lex.leaf_tables, FALSE,
INSERT_ACL | UPDATE_ACL,
INSERT_ACL | UPDATE_ACL))
DBUG_RETURN(-1);
if (!table_list->table || // do not suport join view