diff options
author | Ramil Kalimullin <ramil@mysql.com> | 2010-05-25 18:07:47 +0400 |
---|---|---|
committer | Ramil Kalimullin <ramil@mysql.com> | 2010-05-25 18:07:47 +0400 |
commit | 32d6a7fc8f44eb87f188eb9b722c41d9b53e80c8 (patch) | |
tree | 5eef5e564bd1a7c1d0f5147338f3d41ad6c494c0 | |
parent | eef9ce8c1ab519a150cdc67552e3eb36cfeca7ff (diff) | |
parent | 342819f1680c6821a2b495e2fa888e5291767bb7 (diff) | |
download | mariadb-git-32d6a7fc8f44eb87f188eb9b722c41d9b53e80c8.tar.gz |
Automerge.
-rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 70385b8b501..381aa0cf054 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -493,6 +493,7 @@ int check_user(THD *thd, enum enum_server_command command, } send_ok(thd); thd->password= test(passwd_len); // remember for error messages +#ifndef EMBEDDED_LIBRARY /* Allow the network layer to skip big packets. Although a malicious authenticated session might use this to trick the server to read @@ -500,6 +501,7 @@ int check_user(THD *thd, enum enum_server_command command, that needs to be preserved as to not break backwards compatibility. */ thd->net.skip_big_packet= TRUE; +#endif /* Ready to handle queries */ DBUG_RETURN(0); } |