summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-02-23 14:03:19 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-02-23 14:03:19 +0200
commite82914796d6ae684a89a377e8a42f651b6c0e4d7 (patch)
tree7839787383d57f3a75f80a8f17bc4da6b4164614
parent6f06c819566d4d92e0e369ffbe996a90931a80b8 (diff)
parentfa043c72005db830628aeb539c3304b7a9034ec6 (diff)
downloadmariadb-git-e82914796d6ae684a89a377e8a42f651b6c0e4d7.tar.gz
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
-rw-r--r--sql/sql_acl.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 577084a650a..c5782f65798 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2687,6 +2687,13 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user)
#endif /* HAVE_OPENSSL */
if (want_access & GRANT_ACL)
global.append(" WITH GRANT OPTION",18);
+ else if (acl_user->questions)
+ {
+ char buff[65], *p; // just as in int2str
+ global.append(" WITH MAX_QUERIES_PER_HOUR = ",29);
+ p=int2str(acl_user->questions,buff,10);
+ global.append(buff,p-buff);
+ }
thd->packet.length(0);
net_store_data(&thd->packet,global.ptr(),global.length());
if (my_net_write(&thd->net,(char*) thd->packet.ptr(),