diff options
| author | unknown <gkodinov/kgeorge@rakia.gmz> | 2007-02-01 10:59:14 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@rakia.gmz> | 2007-02-01 10:59:14 +0200 |
| commit | 4ebef0520629873253ed5007aba1a01c91d7f8fd (patch) | |
| tree | 6e27c3ed623225178cd1893ca555b4f7e519601c /sql | |
| parent | 036314d917fc149f529724332d80a74f95ab959a (diff) | |
| parent | cab412666eba39347410f1369e56ace47938a76d (diff) | |
| download | mariadb-git-4ebef0520629873253ed5007aba1a01c91d7f8fd.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1b7cf2a342d..701a68f31b5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3555,7 +3555,7 @@ end_with_restore_list: break; } DBUG_ASSERT(first_table == all_tables && first_table != 0); - if (check_one_table_access(thd, DELETE_ACL, all_tables)) + if (check_one_table_access(thd, DROP_ACL, all_tables)) goto error; /* Don't allow this within a transaction because we want to use |