diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-04 20:57:34 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-04 20:57:34 +0200 |
| commit | ee806ba9a4283e3d8bb06ad438a7fa53e33fd63a (patch) | |
| tree | d5b66de3b9faff2dd9d2b11d90271bb2c8485df9 | |
| parent | 85d8949f6deb5be6fb89e719aa2fbce169306383 (diff) | |
| parent | 5fd52efc994836affb737268d7f00be0be1d583d (diff) | |
| download | mariadb-git-ee806ba9a4283e3d8bb06ad438a7fa53e33fd63a.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
client/mysql.cc:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
Auto merged
client/mysqlshow.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
netware/mysql_test_run.c:
Merged from 4.1.
| -rw-r--r-- | netware/mysql_test_run.c | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 3 |
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 { |