database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

Browse Source 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
jani@a193-229-222-105.elisa-laajakaista.fi
2005-12-04 20:57:34 +02:00
parent 9fd13ba93d 4f6a321bb8
commit c6d933c629
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netware/mysql_test_run.c
View File

@ -349,6 +349,8 @@ void start_master()
add_arg(&al, "--tmpdir=%s", mysql_tmp_dir); add_arg(&al, "--tmpdir=%s", mysql_tmp_dir);
add_arg(&al, "--language=%s", lang_dir); add_arg(&al, "--language=%s", lang_dir);
add_arg(&al, "--log-bin-trust-routine-creators"); 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 #ifdef DEBUG //only for debug builds
add_arg(&al, "--debug"); add_arg(&al, "--debug");
#endif #endif
@ -523,6 +525,8 @@ void start_slave()
add_arg(&al, "-O"); add_arg(&al, "-O");
add_arg(&al, "slave_net_timeout=10"); add_arg(&al, "slave_net_timeout=10");
add_arg(&al, "--log-bin-trust-routine-creators"); 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 #ifdef DEBUG //only for debug builds
add_arg(&al, "--debug"); add_arg(&al, "--debug");
#endif #endif

3
sql/sql_parse.cc
View File

@ -797,6 +797,9 @@ static int check_connection(THD *thd)
DBUG_PRINT("info", DBUG_PRINT("info",
("New connection received on %s", vio_description(net->vio))); ("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 if (!thd->main_security_ctx.host) // If TCP/IP connection
{ {