From 573227ec7360d41da5d0df71fc1a65768c92aea2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 18 Jul 2003 14:11:01 +0500 Subject: SCRUM: Task 499 'init_connect, init_slave options' mysql-test/mysql-test-run.sh: Task 499 'init_connect, init_slave options' This change needs because mysql-test-run cuts string variable on first space sql/mysql_priv.h: Task 499 'init_connect, init_slave options' sql/mysqld.cc: Task 499 'init_connect, init_slave options' sql/protocol.cc: Task 499 'init_connect, init_slave options' sql/set_var.cc: Task 499 'init_connect, init_slave options' sql/set_var.h: Task 499 'init_connect, init_slave options' sql/slave.cc: Task 499 'init_connect, init_slave options' sql/sql_class.cc: Task 499 'init_connect, init_slave options' sql/sql_class.h: Task 499 'init_connect, init_slave options' sql/sql_parse.cc: Task 499 'init_connect, init_slave options' sql/sql_show.cc: Task 499 'init_connect, init_slave options' --- sql/sql_show.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sql/sql_show.cc') diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e8cb59e387e..42c89db9ca4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1587,9 +1587,12 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, break; } case SHOW_CHAR: - pos= value; - end= strend(pos); + { + if (!(pos= value)) + pos= ""; + end= strend(pos); break; + } case SHOW_STARTTIME: nr= (long) (thd->query_start() - start_time); end= int10_to_str(nr, buff, 10); -- cgit v1.2.1 From a0e4a6de568f11f437ed8509f8f748923332c716 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 8 Dec 2003 09:13:14 +0400 Subject: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. (Similar to the client command: mysql_options(... MYSQL_INIT_COMMAND ...). sql/mysql_priv.h: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/mysqld.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/protocol.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/set_var.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/slave.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/sql_class.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/sql_class.h: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/sql_parse.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. sql/sql_show.cc: Task ID 499:Add a new settable string variable(init_connect, init_slave) to mysqld that is executed for all new connections. --- sql/sql_show.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sql/sql_show.cc') diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 42c89db9ca4..c80393715f6 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1618,10 +1618,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, break; case SHOW_CHAR_PTR: { - if (!(pos= *(char**) value)) - pos= ""; - end= strend(pos); - break; + if (!(pos= *(char**) value)) + pos= ""; + end= strend(pos); + break; } #ifdef HAVE_OPENSSL /* First group - functions relying on CTX */ -- cgit v1.2.1