diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 09:44:04 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 09:44:04 +0400 |
| commit | c335939203ee910c378438198a0a363789772310 (patch) | |
| tree | 3688e3403fa27b743b4827b14a5d5c1097db47f4 /sql/set_var.h | |
| parent | 0ff62350f61f3a79e9a34ccff40fc935dc2c0b24 (diff) | |
| parent | a0e4a6de568f11f437ed8509f8f748923332c716 (diff) | |
| download | mariadb-git-c335939203ee910c378438198a0a363789772310.tar.gz | |
post-merge fixes
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 946341c4559..fc7610ee500 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -132,6 +132,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; @@ -803,6 +804,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, NAMED_LIST **found); |