summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2006-05-09 20:50:29 +0300
committerunknown <jani@ua141d10.elisa.omakaista.fi>2006-05-09 20:50:29 +0300
commitf296bb095d76c8b296ed56301d9ac6fe589c05b2 (patch)
treeee3755ece547e22530426e7c62dd99fe5716dedd /sql/sql_acl.h
parent893317aebca6a66fff10183dc920768448556617 (diff)
parentd6c2616c3ff4f3035f140f1b2923186fc8ae3601 (diff)
downloadmariadb-git-f296bb095d76c8b296ed56301d9ac6fe589c05b2.tar.gz
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b: Auto merged BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868: Auto merged BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434: Auto merged BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8: Auto merged BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4: Auto merged client/mysql.cc: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-NOTES~e926d3e6929ac052: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/ndb_condition_pushdown.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/std_data/cacert.pem: Auto merged mysql-test/std_data/client-cert.pem: Auto merged mysql-test/std_data/client-key.pem: Auto merged mysql-test/std_data/server-cert.pem: Auto merged mysql-test/std_data/server-key.pem: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/having.test: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/ndb_condition_pushdown.test: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged vio/vio.c: Auto merged client/client_priv.h: manual merge include/violite.h: Automatic mysql-test/Makefile.am: manual merge mysql-test/r/mysqldump.result: Automatic mysql-test/r/rpl_user_variables.result: Manual merge (diff is because lars removed displaying of binlog) mysql-test/t/disabled.def: manual merge mysql-test/t/mysqldump.test: manual merge mysql-test/t/rpl_user_variables.test: manual merge (Changes becasue of lars removed binlog logging) sql/mysqld.cc: manual merge vio/viossl.c: manual merge vio/viosslfactories.c: manual merge client/client_priv.h.rej: merge 5.0 -> 5.1
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 8c64adbbece..e1153522ed5 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -236,7 +236,6 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list,
bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc,
List <LEX_USER> &user_list, ulong rights,
bool revoke, bool no_error);
-ACL_USER *check_acl_user(LEX_USER *user_name, uint *acl_acl_userdx);
my_bool grant_init();
void grant_free(void);
my_bool grant_reload(THD *thd);