summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--netware/mysql_test_run.c4
-rw-r--r--sql/sql_parse.cc3
2 files changed, 7 insertions, 0 deletions
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c
index 98b7ab7fd8c..6bab2f0149c 100644
--- a/netware/mysql_test_run.c
+++ b/netware/mysql_test_run.c
@@ -349,6 +349,8 @@ void start_master()
add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
add_arg(&al, "--language=%s", lang_dir);
add_arg(&al, "--log-bin-trust-routine-creators");
+ add_arg(&al, "--log-slow-queries");
+ add_arg(&al, "--log-queries-not-using-indexes");
#ifdef DEBUG //only for debug builds
add_arg(&al, "--debug");
#endif
@@ -523,6 +525,8 @@ void start_slave()
add_arg(&al, "-O");
add_arg(&al, "slave_net_timeout=10");
add_arg(&al, "--log-bin-trust-routine-creators");
+ add_arg(&al, "--log-slow-queries");
+ add_arg(&al, "--log-queries-not-using-indexes");
#ifdef DEBUG //only for debug builds
add_arg(&al, "--debug");
#endif
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index c05529da745..94ce66bd71d 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -797,6 +797,9 @@ static int check_connection(THD *thd)
DBUG_PRINT("info",
("New connection received on %s", vio_description(net->vio)));
+#ifdef SIGNAL_WITH_VIO_CLOSE
+ thd->set_active_vio(net->vio);
+#endif
if (!thd->main_security_ctx.host) // If TCP/IP connection
{