diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-20 23:23:42 +0300 |
| commit | 3a91b0646226284a580153ea1b58f1112dbffdbe (patch) | |
| tree | 772f4ae43ad7ce905f024b77bebdd1897d813391 /sql/sql_plugin.cc | |
| parent | 5d8655d5df9923ee9ba0f50781aebe41a056e6a5 (diff) | |
| parent | 9e9f7f7f6cd52dddec8c0eb3fcfa3c0e0b789eac (diff) | |
| download | mariadb-git-3a91b0646226284a580153ea1b58f1112dbffdbe.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/partition_innodb.result
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/item_sum.h
Text conflict in sql/log_event_old.cc
Text conflict in sql/protocol.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_yacc.yy
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 2382fc8ab5e..c15cc6df4f5 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1743,6 +1743,8 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name) bzero(&tables, sizeof(tables)); tables.db= (char *)"mysql"; tables.table_name= tables.alias= (char *)"plugin"; + if (check_table_access(thd, DELETE_ACL, &tables, FALSE, 1, FALSE)) + DBUG_RETURN(TRUE); /* need to open before acquiring LOCK_plugin or it will deadlock */ if (! (table= open_ltable(thd, &tables, TL_WRITE, 0))) |