diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2006-05-30 16:07:49 +0300 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2006-05-30 16:07:49 +0300 |
| commit | c81b4c01bf4d4b05633e66000115366dca2411e6 (patch) | |
| tree | 2c12e857ee11b7f222060e29da2c84e53eaf050b /sql/sql_load.cc | |
| parent | 1edd2cf833b65368263d824e2b79ed9ac93e62e6 (diff) | |
| parent | d402c3d4a39658eb967ee65f49688a2db1d9b9b3 (diff) | |
| download | mariadb-git-c81b4c01bf4d4b05633e66000115366dca2411e6.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index bf8a6b8cfbe..5c5e56f9ecc 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -153,10 +153,11 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ha_enable_transaction(thd, FALSE); if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(TRUE); - if (setup_tables(thd, &thd->lex->select_lex.context, - &thd->lex->select_lex.top_join_list, - table_list, &unused_conds, - &thd->lex->select_lex.leaf_tables, FALSE)) + if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context, + &thd->lex->select_lex.top_join_list, + table_list, &unused_conds, + &thd->lex->select_lex.leaf_tables, FALSE, + INSERT_ACL | UPDATE_ACL)) DBUG_RETURN(-1); if (!table_list->table || // do not suport join view !table_list->updatable || // and derived tables |