diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-04 02:49:35 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-04 02:49:35 +0300 |
| commit | 84b296e24230f43bff0129ff06d33efd7db33f2c (patch) | |
| tree | 944cb9e06a2a3883a000eac55e2f8fcfdf4df32a /sql/sql_parse.cc | |
| parent | 35af1442b6492f0962dd48f8dbcbb995a0f5f7e1 (diff) | |
| parent | 7efa0ee1d4ca5ec469669e2b61276e75d126f01c (diff) | |
| download | mariadb-git-84b296e24230f43bff0129ff06d33efd7db33f2c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7556e399856..65897680e8d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -176,6 +176,7 @@ end: } +#ifndef EMBEDDED_LIBRARY /* Check if user exist and password supplied is correct. @@ -351,6 +352,9 @@ static int check_user(THD *thd, enum enum_server_command command, DBUG_RETURN(-1); } +#endif // EMBEDDED_LIBRARY + + /* Check for maximum allowable user connections, if the mysqld server is started with corresponding variable that is greater then 0. |