summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2006-08-17 10:55:57 -0400
committerunknown <cmiller@zippy.cornsilk.net>2006-08-17 10:55:57 -0400
commit5c8c2ab43b73984889fd6c337523b657861793ea (patch)
tree0bc344c81817bbb0ca3d951fc9dfc30587158b2b /sql/sql_acl.cc
parent860c385346a41c957ca856e40aa2c001d2ebc957 (diff)
parent1c28a068b64262a90803d2e65f70a236e3fd41ca (diff)
downloadmariadb-git-5c8c2ab43b73984889fd6c337523b657861793ea.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 BitKeeper/deleted/.del-mysql_client.result: Auto merged BitKeeper/deleted/.del-mysql_client.test: Auto merged client/mysql.cc: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/grant.test: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 1cfa6792b42..8984ea20241 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -5410,7 +5410,7 @@ bool mysql_rename_user(THD *thd, List <LEX_USER> &list)
result= TRUE;
}
}
-
+
/* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
rebuild_check_host();