summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-06-04 22:09:10 +0400
committerRamil Kalimullin <ramil@mysql.com>2010-06-04 22:09:10 +0400
commit9b5312db1d78247b893066205cffe8b32e0f573d (patch)
tree9ac9e7b5b03bf6312b78c54e975616a638274e17 /sql/sql_connect.cc
parent86dc0f57857ce9e5f1491fdd9a163779040ccff1 (diff)
parent44fc4b8b38fe68ad7d68d5fd13e20bf32462ba19 (diff)
downloadmariadb-git-9b5312db1d78247b893066205cffe8b32e0f573d.tar.gz
Automerge.
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index c0081c13366..7b0ef3eb226 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -496,6 +496,7 @@ check_user(THD *thd, enum enum_server_command command,
}
my_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
@@ -503,6 +504,7 @@ 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);
}