mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
merged
BitKeeper/etc/logging_ok: auto-union BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged ltmain.sh: Auto merged libmysql/Makefile.shared: Auto merged libmysql/libmysql.c: Auto merged myisam/myisamchk.c: Auto merged mysql-test/t/bdb.test: Auto merged sql/ha_myisam.cc: Auto merged sql/item_func.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged
This commit is contained in:
@ -417,6 +417,8 @@ check_connections(THD *thd)
|
||||
return(ER_OUT_OF_RESOURCES);
|
||||
|
||||
thd->client_capabilities=uint2korr(net->read_pos);
|
||||
if (thd->client_capabilities & CLIENT_IGNORE_SPACE)
|
||||
thd->sql_mode|= MODE_IGNORE_SPACE;
|
||||
#ifdef HAVE_OPENSSL
|
||||
DBUG_PRINT("info",
|
||||
("pkt_len:%d, client capabilities: %d",
|
||||
@ -541,8 +543,6 @@ pthread_handler_decl(handle_one_connection,arg)
|
||||
thd->options |= OPTION_BIG_SELECTS;
|
||||
if (thd->client_capabilities & CLIENT_COMPRESS)
|
||||
net->compress=1; // Use compression
|
||||
if (thd->options & OPTION_ANSI_MODE)
|
||||
thd->client_capabilities|=CLIENT_IGNORE_SPACE;
|
||||
|
||||
thd->proc_info=0; // Remove 'login'
|
||||
thd->command=COM_SLEEP;
|
||||
|
Reference in New Issue
Block a user