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'

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 978aba3384a..3b11528e7dc 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -137,6 +137,7 @@ class sys_var_str :public sys_var
 {
 public:
   char *value;					// Pointer to allocated string
+  uint value_length;
   sys_check_func check_func;
   sys_update_func update_func;
   sys_set_default_func set_default_func;
@@ -704,6 +705,8 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list);
 void fix_delay_key_write(THD *thd, enum_var_type type);
 ulong fix_sql_mode(ulong sql_mode);
 extern sys_var_str sys_charset_system;
+extern sys_var_str sys_init_connect;
+extern sys_var_str sys_init_slave;
 CHARSET_INFO *get_old_charset_by_name(const char *old_name);
 gptr find_named(I_List<NAMED_LIST> *list, const char *name, uint length);
 void delete_elements(I_List<NAMED_LIST> *list, void (*free_element)(gptr));