Skip to content

M
MariaDB
Commit 08e5b18f authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mashka.mysql.fi:/home/my/mysql-tmp
parents 4b3b4b92 fbbc9a00
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
sql/sql_parse.cc
View file @ 08e5b18f
...@@ -176,6 +176,7 @@ static int get_or_create_user_conn(THD *thd, const char *user, ...@@ -176,6 +176,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
} }
#ifndef EMBEDDED_LIBRARY
/* /*
Check if user exist and password supplied is correct. Check if user exist and password supplied is correct.
...@@ -351,6 +352,9 @@ static int check_user(THD *thd, enum enum_server_command command, ...@@ -351,6 +352,9 @@ static int check_user(THD *thd, enum enum_server_command command,
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
#endif // EMBEDDED_LIBRARY
/* /*
Check for maximum allowable user connections, if the mysqld server is Check for maximum allowable user connections, if the mysqld server is
started with corresponding variable that is greater then 0. started with corresponding variable that is greater then 0.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7