summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-07-14 19:40:50 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2016-07-14 19:40:50 +0000
commit49a5faa1c215044eec860f6ec15a22b57bdb0d5c (patch)
tree51fe50561b04776c42c1c8977ce7fdb0304860f0 /sql/sql_parse.cc
parent90a3eeba76835962fc39f5c4e398d1c921640520 (diff)
downloadmariadb-git-10.2-wlad-batch-mode.tar.gz
Dump skip_flush, queries get stuck. Instead, just allow to switch on Nagle's algorithm temporarily10.2-wlad-batch-mode
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 05f3c85e9be..4bd346a6d63 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1638,8 +1638,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
if (thd->variables.batch_mode &&
- !thd->killed && !thd->is_error() &&
- vio_io_wait(thd->net.vio, VIO_IO_EVENT_READ, 0) > 0)
+ !thd->killed && !thd->is_error())
{
/* More commands follow, skip flush */
thd->get_stmt_da()->set_skip_flush();