diff options
| author | unknown <istruewing@stella.local> | 2008-02-14 16:53:03 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-02-14 16:53:03 +0100 |
| commit | 770b13149932808870ec0183b67fd44b9f9539a1 (patch) | |
| tree | a49c7a5dd76561facfd53b760feaadf0369e787b /sql/sql_plugin.cc | |
| parent | 222b6dfe1f4048ca2999e853fbe7923591848c16 (diff) | |
| parent | a0d88ebb0b5f77b30c65152f87aa73363ce93d71 (diff) | |
| download | mariadb-git-770b13149932808870ec0183b67fd44b9f9539a1.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index bae4a85fd8a..74c99b5773d 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1638,7 +1638,7 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, const LEX_STRING *dl bzero(&tables, sizeof(tables)); tables.db= (char *)"mysql"; tables.table_name= tables.alias= (char *)"plugin"; - if (check_table_access(thd, INSERT_ACL, &tables, 0)) + if (check_table_access(thd, INSERT_ACL, &tables, 1, FALSE)) DBUG_RETURN(TRUE); /* need to open before acquiring LOCK_plugin or it will deadlock */ |