summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2001-12-26 17:42:06 +0200
committerSinisa@sinisa.nasamreza.org <>2001-12-26 17:42:06 +0200
commit4ed4546004cc06c43606f6810c409feb208fdf0b (patch)
tree89ec1a3a0a7c33283b19588a9a564d110058eed0 /libmysqld
parent0111030d4588053cd797fbf70fe58d852b64adaf (diff)
parent038db406c15f3ebe90639218a447d98467749796 (diff)
downloadmariadb-git-4ed4546004cc06c43606f6810c409feb208fdf0b.tar.gz
Changes for the BitKeeper resolve.
One more notice: limiting number of queries per hour for different users has been done on 4.0.1 , but I can port it to 3.23.* This will require only certain changes, like number of columns in user table. I will also make a test case for it, after it is approved by Monty, as result file will depend on the error message text.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index f9d5ccfec72..ed666659af1 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -228,11 +228,11 @@ check_connections2(THD * thd)
return 0;
}
-
static bool check_user(THD *thd,enum_server_command command, const char *user,
const char *passwd, const char *db, bool check_count)
{
NET *net= &thd->net;
+ uint max=0;
thd->db=0;
if (!(thd->user = my_strdup(user, MYF(0))))
@@ -244,7 +244,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
passwd, thd->scramble, &thd->priv_user,
protocol_version == 9 ||
!(thd->client_capabilities &
- CLIENT_LONG_PASSWORD));
+ CLIENT_LONG_PASSWORD),&max);
DBUG_PRINT("general",
("Capabilities: %d packet_length: %d Host: '%s' User: '%s' Using password: %s Access: %u db: '%s'",
thd->client_capabilities, thd->max_packet_length,