2003-07-06 18:09:57 +02:00
|
|
|
/* Copyright (C) 2000-2003 MySQL AB
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
|
|
/*
|
|
|
|
Handling of MySQL SQL variables
|
|
|
|
|
|
|
|
To add a new variable, one has to do the following:
|
|
|
|
|
|
|
|
- Use one of the 'sys_var... classes from set_var.h or write a specific
|
|
|
|
one for the variable type.
|
|
|
|
- Define it in the 'variable definition list' in this file.
|
2002-10-02 12:33:08 +02:00
|
|
|
- If the variable should be changeable or one should be able to access it
|
|
|
|
with @@variable_name, it should be added to the 'list of all variables'
|
2004-02-16 18:53:00 +01:00
|
|
|
list (sys_variables) in this file.
|
|
|
|
- If the variable is thread specific, add it to 'system_variables' struct.
|
|
|
|
If not, add it to mysqld.cc and an declaration in 'mysql_priv.h'
|
2002-07-23 17:31:22 +02:00
|
|
|
- If the variable should be changed from the command line, add a definition
|
|
|
|
of it in the my_option structure list in mysqld.dcc
|
2004-02-16 18:53:00 +01:00
|
|
|
- Don't forget to initialize new fields in global_system_variables and
|
|
|
|
max_system_variables!
|
2002-07-23 17:31:22 +02:00
|
|
|
- If the variable should show up in 'show variables' add it to the
|
|
|
|
init_vars[] struct in this file
|
|
|
|
|
2004-08-16 17:00:48 +02:00
|
|
|
NOTES:
|
|
|
|
- Be careful with var->save_result: sys_var::check() only updates
|
|
|
|
ulonglong_value; so other members of the union are garbage then; to use
|
|
|
|
them you must first assign a value to them (in specific ::check() for
|
|
|
|
example).
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
TODO:
|
|
|
|
- Add full support for the variable character_set (for 4.1)
|
|
|
|
|
|
|
|
- When updating myisam_delay_key_write, we should do a 'flush tables'
|
|
|
|
of all MyISAM tables to ensure that they are reopen with the
|
|
|
|
new attribute.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#pragma implementation // gcc: Class implementation
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "mysql_priv.h"
|
2002-12-16 14:33:29 +01:00
|
|
|
#include <mysql.h>
|
2002-07-23 17:31:22 +02:00
|
|
|
#include "slave.h"
|
|
|
|
#include "sql_acl.h"
|
|
|
|
#include <my_getopt.h>
|
2003-10-16 06:44:18 +02:00
|
|
|
#include <thr_alarm.h>
|
2002-07-23 17:31:22 +02:00
|
|
|
#include <myisam.h>
|
|
|
|
#ifdef HAVE_BERKELEY_DB
|
|
|
|
#include "ha_berkeley.h"
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_INNOBASE_DB
|
|
|
|
#include "ha_innodb.h"
|
|
|
|
#endif
|
2004-04-15 09:14:14 +02:00
|
|
|
#ifdef HAVE_NDBCLUSTER_DB
|
|
|
|
#include "ha_ndbcluster.h"
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
static HASH system_variable_hash;
|
|
|
|
const char *bool_type_names[]= { "OFF", "ON", NullS };
|
|
|
|
TYPELIB bool_typelib=
|
|
|
|
{
|
|
|
|
array_elements(bool_type_names)-1, "", bool_type_names
|
|
|
|
};
|
|
|
|
|
2002-08-13 01:18:39 +02:00
|
|
|
const char *delay_key_write_type_names[]= { "OFF", "ON", "ALL", NullS };
|
|
|
|
TYPELIB delay_key_write_typelib=
|
|
|
|
{
|
|
|
|
array_elements(delay_key_write_type_names)-1, "", delay_key_write_type_names
|
|
|
|
};
|
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
static int sys_check_charset(THD *thd, set_var *var);
|
2002-07-23 17:31:22 +02:00
|
|
|
static bool sys_update_charset(THD *thd, set_var *var);
|
|
|
|
static void sys_set_default_charset(THD *thd, enum_var_type type);
|
2004-03-27 01:07:09 +01:00
|
|
|
static int sys_check_ftb_syntax(THD *thd, set_var *var);
|
2004-02-16 18:53:00 +01:00
|
|
|
static bool sys_update_ftb_syntax(THD *thd, set_var * var);
|
|
|
|
static void sys_default_ftb_syntax(THD *thd, enum_var_type type);
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
static bool sys_update_init_connect(THD*, set_var*);
|
|
|
|
static void sys_default_init_connect(THD*, enum_var_type type);
|
|
|
|
static bool sys_update_init_slave(THD*, set_var*);
|
|
|
|
static void sys_default_init_slave(THD*, enum_var_type type);
|
2002-07-23 17:31:22 +02:00
|
|
|
static bool set_option_bit(THD *thd, set_var *var);
|
|
|
|
static bool set_option_autocommit(THD *thd, set_var *var);
|
2004-03-27 01:07:09 +01:00
|
|
|
static int check_log_update(THD *thd, set_var *var);
|
2002-07-23 17:31:22 +02:00
|
|
|
static bool set_log_update(THD *thd, set_var *var);
|
2004-03-27 01:07:09 +01:00
|
|
|
static int check_pseudo_thread_id(THD *thd, set_var *var);
|
2002-07-23 17:31:22 +02:00
|
|
|
static void fix_low_priority_updates(THD *thd, enum_var_type type);
|
|
|
|
static void fix_tx_isolation(THD *thd, enum_var_type type);
|
|
|
|
static void fix_net_read_timeout(THD *thd, enum_var_type type);
|
|
|
|
static void fix_net_write_timeout(THD *thd, enum_var_type type);
|
2002-08-08 19:49:06 +02:00
|
|
|
static void fix_net_retry_count(THD *thd, enum_var_type type);
|
2002-07-23 17:31:22 +02:00
|
|
|
static void fix_max_join_size(THD *thd, enum_var_type type);
|
|
|
|
static void fix_query_cache_size(THD *thd, enum_var_type type);
|
2003-03-02 20:39:03 +01:00
|
|
|
static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type);
|
2003-05-13 18:34:51 +02:00
|
|
|
static void fix_myisam_max_extra_sort_file_size(THD *thd, enum_var_type type);
|
|
|
|
static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);
|
2003-07-06 17:59:54 +02:00
|
|
|
static void fix_max_binlog_size(THD *thd, enum_var_type type);
|
|
|
|
static void fix_max_relay_log_size(THD *thd, enum_var_type type);
|
2003-10-06 14:11:16 +02:00
|
|
|
static void fix_max_connections(THD *thd, enum_var_type type);
|
2004-04-09 18:50:28 +02:00
|
|
|
static int check_max_delayed_threads(THD *thd, set_var *var);
|
2004-02-02 21:01:58 +01:00
|
|
|
static void fix_thd_mem_root(THD *thd, enum_var_type type);
|
|
|
|
static void fix_trans_mem_root(THD *thd, enum_var_type type);
|
2004-05-19 15:03:32 +02:00
|
|
|
static void fix_server_id(THD *thd, enum_var_type type);
|
2003-11-20 21:06:25 +01:00
|
|
|
static KEY_CACHE *create_key_cache(const char *name, uint length);
|
2003-06-04 17:28:51 +02:00
|
|
|
void fix_sql_mode_var(THD *thd, enum_var_type type);
|
2002-10-02 12:33:08 +02:00
|
|
|
static byte *get_error_count(THD *thd);
|
|
|
|
static byte *get_warning_count(THD *thd);
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Variable definition list
|
|
|
|
|
|
|
|
These are variables that can be set from the command line, in
|
|
|
|
alphabetic order
|
|
|
|
*/
|
|
|
|
|
|
|
|
sys_var_long_ptr sys_binlog_cache_size("binlog_cache_size",
|
|
|
|
&binlog_cache_size);
|
|
|
|
sys_var_thd_ulong sys_bulk_insert_buff_size("bulk_insert_buffer_size",
|
|
|
|
&SV::bulk_insert_buff_size);
|
2003-05-30 10:03:56 +02:00
|
|
|
sys_var_character_set_server sys_character_set_server("character_set_server");
|
|
|
|
sys_var_str sys_charset_system("character_set_system",
|
2003-05-21 10:58:30 +02:00
|
|
|
sys_check_charset,
|
|
|
|
sys_update_charset,
|
2004-03-20 14:36:00 +01:00
|
|
|
sys_set_default_charset,
|
|
|
|
(char *)my_charset_utf8_general_ci.name);
|
2003-05-30 10:03:56 +02:00
|
|
|
sys_var_character_set_database sys_character_set_database("character_set_database");
|
2003-05-21 14:44:12 +02:00
|
|
|
sys_var_character_set_client sys_character_set_client("character_set_client");
|
2003-05-30 10:24:24 +02:00
|
|
|
sys_var_character_set_connection sys_character_set_connection("character_set_connection");
|
2003-05-21 14:44:12 +02:00
|
|
|
sys_var_character_set_results sys_character_set_results("character_set_results");
|
2003-04-23 15:19:22 +02:00
|
|
|
sys_var_collation_connection sys_collation_connection("collation_connection");
|
2003-09-15 13:31:04 +02:00
|
|
|
sys_var_collation_database sys_collation_database("collation_database");
|
|
|
|
sys_var_collation_server sys_collation_server("collation_server");
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_bool_ptr sys_concurrent_insert("concurrent_insert",
|
|
|
|
&myisam_concurrent_insert);
|
|
|
|
sys_var_long_ptr sys_connect_timeout("connect_timeout",
|
|
|
|
&connect_timeout);
|
2002-08-13 01:18:39 +02:00
|
|
|
sys_var_enum sys_delay_key_write("delay_key_write",
|
|
|
|
&delay_key_write_options,
|
|
|
|
&delay_key_write_typelib,
|
|
|
|
fix_delay_key_write);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_delayed_insert_limit("delayed_insert_limit",
|
|
|
|
&delayed_insert_limit);
|
|
|
|
sys_var_long_ptr sys_delayed_insert_timeout("delayed_insert_timeout",
|
|
|
|
&delayed_insert_timeout);
|
|
|
|
sys_var_long_ptr sys_delayed_queue_size("delayed_queue_size",
|
|
|
|
&delayed_queue_size);
|
2003-03-11 10:49:06 +01:00
|
|
|
sys_var_long_ptr sys_expire_logs_days("expire_logs_days",
|
|
|
|
&expire_logs_days);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_bool_ptr sys_flush("flush", &myisam_flush);
|
|
|
|
sys_var_long_ptr sys_flush_time("flush_time", &flush_time);
|
2004-02-16 18:53:00 +01:00
|
|
|
sys_var_str sys_ft_boolean_syntax("ft_boolean_syntax",
|
|
|
|
sys_check_ftb_syntax,
|
|
|
|
sys_update_ftb_syntax,
|
2004-03-20 14:36:00 +01:00
|
|
|
sys_default_ftb_syntax,
|
|
|
|
ft_boolean_syntax);
|
2004-02-16 18:53:00 +01:00
|
|
|
sys_var_str sys_init_connect("init_connect", 0,
|
|
|
|
sys_update_init_connect,
|
2004-03-20 14:36:00 +01:00
|
|
|
sys_default_init_connect,0);
|
2004-02-16 18:53:00 +01:00
|
|
|
sys_var_str sys_init_slave("init_slave", 0,
|
|
|
|
sys_update_init_slave,
|
2004-03-20 14:36:00 +01:00
|
|
|
sys_default_init_slave,0);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_interactive_timeout("interactive_timeout",
|
|
|
|
&SV::net_interactive_timeout);
|
|
|
|
sys_var_thd_ulong sys_join_buffer_size("join_buffer_size",
|
|
|
|
&SV::join_buff_size);
|
2003-07-06 18:09:57 +02:00
|
|
|
sys_var_key_buffer_size sys_key_buffer_size("key_buffer_size");
|
2003-11-18 12:47:27 +01:00
|
|
|
sys_var_key_cache_long sys_key_cache_block_size("key_cache_block_size",
|
2003-11-20 21:06:25 +01:00
|
|
|
offsetof(KEY_CACHE,
|
|
|
|
param_block_size));
|
2003-11-18 12:47:27 +01:00
|
|
|
sys_var_key_cache_long sys_key_cache_division_limit("key_cache_division_limit",
|
2003-11-20 21:06:25 +01:00
|
|
|
offsetof(KEY_CACHE,
|
|
|
|
param_division_limit));
|
2003-11-18 12:47:27 +01:00
|
|
|
sys_var_key_cache_long sys_key_cache_age_threshold("key_cache_age_threshold",
|
2003-11-20 21:06:25 +01:00
|
|
|
offsetof(KEY_CACHE,
|
|
|
|
param_age_threshold));
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_bool_ptr sys_local_infile("local_infile",
|
|
|
|
&opt_local_infile);
|
2004-06-01 16:29:24 +02:00
|
|
|
sys_var_thd_ulong sys_log_warnings("log_warnings", &SV::log_warnings);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_long_query_time("long_query_time",
|
|
|
|
&SV::long_query_time);
|
|
|
|
sys_var_thd_bool sys_low_priority_updates("low_priority_updates",
|
|
|
|
&SV::low_priority_updates,
|
|
|
|
fix_low_priority_updates);
|
|
|
|
#ifndef TO_BE_DELETED /* Alias for the low_priority_updates */
|
|
|
|
sys_var_thd_bool sys_sql_low_priority_updates("sql_low_priority_updates",
|
|
|
|
&SV::low_priority_updates,
|
|
|
|
fix_low_priority_updates);
|
|
|
|
#endif
|
|
|
|
sys_var_thd_ulong sys_max_allowed_packet("max_allowed_packet",
|
|
|
|
&SV::max_allowed_packet);
|
|
|
|
sys_var_long_ptr sys_max_binlog_cache_size("max_binlog_cache_size",
|
|
|
|
&max_binlog_cache_size);
|
|
|
|
sys_var_long_ptr sys_max_binlog_size("max_binlog_size",
|
2003-07-06 17:59:54 +02:00
|
|
|
&max_binlog_size,
|
|
|
|
fix_max_binlog_size);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_max_connections("max_connections",
|
2003-10-06 14:11:16 +02:00
|
|
|
&max_connections,
|
|
|
|
fix_max_connections);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_max_connect_errors("max_connect_errors",
|
|
|
|
&max_connect_errors);
|
2004-03-04 18:58:36 +01:00
|
|
|
sys_var_thd_ulong sys_max_insert_delayed_threads("max_insert_delayed_threads",
|
2004-04-09 18:50:28 +02:00
|
|
|
&SV::max_insert_delayed_threads,
|
|
|
|
check_max_delayed_threads,
|
|
|
|
fix_max_connections);
|
2004-03-04 18:58:36 +01:00
|
|
|
sys_var_thd_ulong sys_max_delayed_threads("max_delayed_threads",
|
|
|
|
&SV::max_insert_delayed_threads,
|
2004-04-09 18:50:28 +02:00
|
|
|
check_max_delayed_threads,
|
|
|
|
fix_max_connections);
|
2002-10-02 12:33:08 +02:00
|
|
|
sys_var_thd_ulong sys_max_error_count("max_error_count",
|
|
|
|
&SV::max_error_count);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_max_heap_table_size("max_heap_table_size",
|
|
|
|
&SV::max_heap_table_size);
|
2004-03-27 01:07:09 +01:00
|
|
|
sys_var_thd_ulong sys_pseudo_thread_id("pseudo_thread_id",
|
|
|
|
&SV::pseudo_thread_id,
|
|
|
|
check_pseudo_thread_id, 0);
|
2002-12-20 13:58:27 +01:00
|
|
|
sys_var_thd_ha_rows sys_max_join_size("max_join_size",
|
2002-07-23 17:31:22 +02:00
|
|
|
&SV::max_join_size,
|
|
|
|
fix_max_join_size);
|
2003-06-27 02:04:54 +02:00
|
|
|
sys_var_thd_ulong sys_max_seeks_for_key("max_seeks_for_key",
|
|
|
|
&SV::max_seeks_for_key);
|
2003-04-24 13:33:33 +02:00
|
|
|
sys_var_thd_ulong sys_max_length_for_sort_data("max_length_for_sort_data",
|
2004-03-27 01:07:09 +01:00
|
|
|
&SV::max_length_for_sort_data);
|
2002-07-23 17:31:22 +02:00
|
|
|
#ifndef TO_BE_DELETED /* Alias for max_join_size */
|
2002-12-20 13:58:27 +01:00
|
|
|
sys_var_thd_ha_rows sys_sql_max_join_size("sql_max_join_size",
|
2002-07-23 17:31:22 +02:00
|
|
|
&SV::max_join_size,
|
|
|
|
fix_max_join_size);
|
|
|
|
#endif
|
2003-07-06 17:59:54 +02:00
|
|
|
sys_var_long_ptr sys_max_relay_log_size("max_relay_log_size",
|
|
|
|
&max_relay_log_size,
|
|
|
|
fix_max_relay_log_size);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_max_sort_length("max_sort_length",
|
|
|
|
&SV::max_sort_length);
|
|
|
|
sys_var_long_ptr sys_max_user_connections("max_user_connections",
|
|
|
|
&max_user_connections);
|
|
|
|
sys_var_thd_ulong sys_max_tmp_tables("max_tmp_tables",
|
|
|
|
&SV::max_tmp_tables);
|
|
|
|
sys_var_long_ptr sys_max_write_lock_count("max_write_lock_count",
|
|
|
|
&max_write_lock_count);
|
2004-05-01 15:41:59 +02:00
|
|
|
sys_var_long_ptr sys_myisam_data_pointer_size("myisam_data_pointer_size",
|
|
|
|
&myisam_data_pointer_size);
|
2003-05-13 18:34:51 +02:00
|
|
|
sys_var_thd_ulonglong sys_myisam_max_extra_sort_file_size("myisam_max_extra_sort_file_size", &SV::myisam_max_extra_sort_file_size, fix_myisam_max_extra_sort_file_size, 1);
|
|
|
|
sys_var_thd_ulonglong sys_myisam_max_sort_file_size("myisam_max_sort_file_size", &SV::myisam_max_sort_file_size, fix_myisam_max_sort_file_size, 1);
|
2003-05-04 18:43:37 +02:00
|
|
|
sys_var_thd_ulong sys_myisam_repair_threads("myisam_repair_threads", &SV::myisam_repair_threads);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_myisam_sort_buffer_size("myisam_sort_buffer_size", &SV::myisam_sort_buff_size);
|
|
|
|
sys_var_thd_ulong sys_net_buffer_length("net_buffer_length",
|
|
|
|
&SV::net_buffer_length);
|
|
|
|
sys_var_thd_ulong sys_net_read_timeout("net_read_timeout",
|
|
|
|
&SV::net_read_timeout,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_net_read_timeout);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_net_write_timeout("net_write_timeout",
|
|
|
|
&SV::net_write_timeout,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_net_write_timeout);
|
2002-08-08 19:49:06 +02:00
|
|
|
sys_var_thd_ulong sys_net_retry_count("net_retry_count",
|
|
|
|
&SV::net_retry_count,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_net_retry_count);
|
2003-03-05 18:43:56 +01:00
|
|
|
sys_var_thd_bool sys_new_mode("new", &SV::new_mode);
|
2003-07-08 00:36:14 +02:00
|
|
|
sys_var_thd_bool sys_old_passwords("old_passwords", &SV::old_passwords);
|
2003-06-12 13:29:02 +02:00
|
|
|
sys_var_thd_ulong sys_preload_buff_size("preload_buffer_size",
|
|
|
|
&SV::preload_buff_size);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_read_buff_size("read_buffer_size",
|
|
|
|
&SV::read_buff_size);
|
2003-05-26 10:47:03 +02:00
|
|
|
sys_var_bool_ptr sys_readonly("read_only", &opt_readonly);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_ulong sys_read_rnd_buff_size("read_rnd_buffer_size",
|
|
|
|
&SV::read_rnd_buff_size);
|
Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
sql/log.cc:
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT.
sql/log_event.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/mysql_priv.h:
new option relay_log_purge (the user can now decide himself
if he wants his relay logs to be automatically purged or not,
we don't make unsafe guesses like before)
sql/mysqld.cc:
new option --innodb (replaces --skip-innodb).
Useful for the test suite : we have skip-innodb in mysql-test-run,
but we can ('-opt.info' file) choose to start the server with
InnoDB for this test only.
New option --bdb
sql/repl_failsafe.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/set_var.cc:
new variable relay_log_purge
sql/slave.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT
sql/slave.h:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/sql_class.h:
prototypes change
sql/sql_parse.cc:
removed thd argument (was not used in the function's body)
sql/sql_repl.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Turn relay_log_purge silently off when someone does CHANGE
MASTER TO RELAY_LOG_*
2003-04-24 15:29:25 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
sys_var_bool_ptr sys_relay_log_purge("relay_log_purge",
|
|
|
|
&relay_log_purge);
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_rpl_recovery_rank("rpl_recovery_rank",
|
|
|
|
&rpl_recovery_rank);
|
|
|
|
sys_var_long_ptr sys_query_cache_size("query_cache_size",
|
|
|
|
&query_cache_size,
|
|
|
|
fix_query_cache_size);
|
2003-10-11 21:00:24 +02:00
|
|
|
|
|
|
|
sys_var_thd_ulong sys_range_alloc_block_size("range_alloc_block_size",
|
|
|
|
&SV::range_alloc_block_size);
|
|
|
|
sys_var_thd_ulong sys_query_alloc_block_size("query_alloc_block_size",
|
2004-02-02 21:01:58 +01:00
|
|
|
&SV::query_alloc_block_size,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_thd_mem_root);
|
2003-10-11 21:00:24 +02:00
|
|
|
sys_var_thd_ulong sys_query_prealloc_size("query_prealloc_size",
|
2004-02-02 21:01:58 +01:00
|
|
|
&SV::query_prealloc_size,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_thd_mem_root);
|
2003-10-11 21:00:24 +02:00
|
|
|
sys_var_thd_ulong sys_trans_alloc_block_size("transaction_alloc_block_size",
|
2004-02-02 21:01:58 +01:00
|
|
|
&SV::trans_alloc_block_size,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_trans_mem_root);
|
2003-10-11 21:00:24 +02:00
|
|
|
sys_var_thd_ulong sys_trans_prealloc_size("transaction_prealloc_size",
|
2004-02-02 21:01:58 +01:00
|
|
|
&SV::trans_prealloc_size,
|
2004-03-27 01:07:09 +01:00
|
|
|
0, fix_trans_mem_root);
|
2003-10-11 21:00:24 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
#ifdef HAVE_QUERY_CACHE
|
|
|
|
sys_var_long_ptr sys_query_cache_limit("query_cache_limit",
|
|
|
|
&query_cache.query_cache_limit);
|
2003-03-02 20:39:03 +01:00
|
|
|
sys_var_long_ptr sys_query_cache_min_res_unit("query_cache_min_res_unit",
|
|
|
|
&query_cache_min_res_unit,
|
|
|
|
fix_query_cache_min_res_unit);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_thd_enum sys_query_cache_type("query_cache_type",
|
|
|
|
&SV::query_cache_type,
|
|
|
|
&query_cache_type_typelib);
|
2004-03-04 17:32:55 +01:00
|
|
|
sys_var_thd_bool
|
|
|
|
sys_query_cache_wlock_invalidate("query_cache_wlock_invalidate",
|
|
|
|
&SV::query_cache_wlock_invalidate);
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif /* HAVE_QUERY_CACHE */
|
2003-07-08 00:36:14 +02:00
|
|
|
sys_var_bool_ptr sys_secure_auth("secure_auth", &opt_secure_auth);
|
2004-05-19 15:03:32 +02:00
|
|
|
sys_var_long_ptr sys_server_id("server_id", &server_id, fix_server_id);
|
2002-08-08 02:12:02 +02:00
|
|
|
sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol",
|
|
|
|
&opt_slave_compressed_protocol);
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_slave_net_timeout("slave_net_timeout",
|
|
|
|
&slave_net_timeout);
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_slow_launch_time("slow_launch_time",
|
|
|
|
&slow_launch_time);
|
|
|
|
sys_var_thd_ulong sys_sort_buffer("sort_buffer_size",
|
|
|
|
&SV::sortbuff_size);
|
2003-01-16 01:04:50 +01:00
|
|
|
sys_var_thd_sql_mode sys_sql_mode("sql_mode",
|
|
|
|
&SV::sql_mode);
|
2003-12-02 21:23:13 +01:00
|
|
|
sys_var_thd_table_type sys_table_type("table_type",
|
|
|
|
&SV::table_type);
|
2003-12-17 23:52:03 +01:00
|
|
|
sys_var_thd_storage_engine sys_storage_engine("storage_engine",
|
|
|
|
&SV::table_type);
|
2004-06-10 15:56:13 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
sys_var_sync_binlog_period sys_sync_binlog_period("sync_binlog", &sync_binlog_period);
|
|
|
|
#endif
|
|
|
|
sys_var_bool_ptr sys_sync_frm("sync_frm", &opt_sync_frm);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var_long_ptr sys_table_cache_size("table_cache",
|
|
|
|
&table_cache_size);
|
|
|
|
sys_var_long_ptr sys_thread_cache_size("thread_cache_size",
|
|
|
|
&thread_cache_size);
|
|
|
|
sys_var_thd_enum sys_tx_isolation("tx_isolation",
|
|
|
|
&SV::tx_isolation,
|
|
|
|
&tx_isolation_typelib,
|
|
|
|
fix_tx_isolation);
|
|
|
|
sys_var_thd_ulong sys_tmp_table_size("tmp_table_size",
|
|
|
|
&SV::tmp_table_size);
|
|
|
|
sys_var_thd_ulong sys_net_wait_timeout("wait_timeout",
|
|
|
|
&SV::net_wait_timeout);
|
2003-11-03 13:01:59 +01:00
|
|
|
|
2003-05-04 12:41:21 +02:00
|
|
|
#ifdef HAVE_INNOBASE_DB
|
|
|
|
sys_var_long_ptr sys_innodb_max_dirty_pages_pct("innodb_max_dirty_pages_pct",
|
|
|
|
&srv_max_buf_pool_modified_pct);
|
2004-10-20 10:24:08 +02:00
|
|
|
sys_var_thd_bool sys_innodb_table_locks("innodb_table_locks",
|
|
|
|
&SV::innodb_table_locks);
|
2004-09-30 11:31:41 +02:00
|
|
|
sys_var_long_ptr sys_innodb_autoextend_increment("innodb_autoextend_increment",
|
|
|
|
&srv_auto_extend_increment);
|
2004-09-30 14:54:19 +02:00
|
|
|
sys_var_long_ptr sys_innodb_max_purge_lag("innodb_max_purge_lag",
|
|
|
|
&srv_max_purge_lag);
|
2004-02-16 18:53:00 +01:00
|
|
|
#endif
|
2003-11-03 13:01:59 +01:00
|
|
|
|
|
|
|
/* Time/date/datetime formats */
|
|
|
|
|
|
|
|
sys_var_thd_date_time_format sys_time_format("time_format",
|
|
|
|
&SV::time_format,
|
Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
VC++Files/libmysql/libmysql.dsp:
new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
new file: my_time.c
VC++Files/sql/mysqld.dsp:
new file: my_time.c
include/Makefile.am:
- mysql_time.h added to the list of installed client library headers
include/mysql.h:
- declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to
mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
- my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
Fix for bug#4030 "Client side conversion string -> date type doesn't work
(prepared statements)" and cleanup.
- added case labels for TIME/DATE/DATETIME types to send_data_str
- comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
- my_time.c added
sql-common/Makefile.am:
- my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
my_time.c added to the list of mysqld sources.
sql/field.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
- added typedefs for TIME and timestamp_type
- removed declarations for str_to_time and str_to_TIME (now this functions
reside in mysys)
sql/mysqld.cc:
- log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
- enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
- fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
- TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
- embedded library implementation of set_param_{time,date,datetime} is
much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
- s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
- declarations for TIME and timestamp_type replaced with typedefs
- str_to_datetime arguments moved to mysys headers
sql/time.cc:
- str_to_time and str_to_TIME moved to mysys
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
exported to client.
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
- a test case for Bug#4030 "Client side conversion string -> date type
doesn't work (prepared statements)"
2004-06-24 17:08:36 +02:00
|
|
|
MYSQL_TIMESTAMP_TIME);
|
2003-11-03 13:01:59 +01:00
|
|
|
sys_var_thd_date_time_format sys_date_format("date_format",
|
|
|
|
&SV::date_format,
|
Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
VC++Files/libmysql/libmysql.dsp:
new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
new file: my_time.c
VC++Files/sql/mysqld.dsp:
new file: my_time.c
include/Makefile.am:
- mysql_time.h added to the list of installed client library headers
include/mysql.h:
- declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to
mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
- my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
Fix for bug#4030 "Client side conversion string -> date type doesn't work
(prepared statements)" and cleanup.
- added case labels for TIME/DATE/DATETIME types to send_data_str
- comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
- my_time.c added
sql-common/Makefile.am:
- my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
my_time.c added to the list of mysqld sources.
sql/field.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
- added typedefs for TIME and timestamp_type
- removed declarations for str_to_time and str_to_TIME (now this functions
reside in mysys)
sql/mysqld.cc:
- log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
- enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
- fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
- TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
- embedded library implementation of set_param_{time,date,datetime} is
much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
- s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
- declarations for TIME and timestamp_type replaced with typedefs
- str_to_datetime arguments moved to mysys headers
sql/time.cc:
- str_to_time and str_to_TIME moved to mysys
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
exported to client.
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
- a test case for Bug#4030 "Client side conversion string -> date type
doesn't work (prepared statements)"
2004-06-24 17:08:36 +02:00
|
|
|
MYSQL_TIMESTAMP_DATE);
|
2003-11-03 13:01:59 +01:00
|
|
|
sys_var_thd_date_time_format sys_datetime_format("datetime_format",
|
|
|
|
&SV::datetime_format,
|
Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
VC++Files/libmysql/libmysql.dsp:
new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
new file: my_time.c
VC++Files/sql/mysqld.dsp:
new file: my_time.c
include/Makefile.am:
- mysql_time.h added to the list of installed client library headers
include/mysql.h:
- declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to
mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
- my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
Fix for bug#4030 "Client side conversion string -> date type doesn't work
(prepared statements)" and cleanup.
- added case labels for TIME/DATE/DATETIME types to send_data_str
- comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
- my_time.c added
sql-common/Makefile.am:
- my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
my_time.c added to the list of mysqld sources.
sql/field.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
- added typedefs for TIME and timestamp_type
- removed declarations for str_to_time and str_to_TIME (now this functions
reside in mysys)
sql/mysqld.cc:
- log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
- enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
- fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
- TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
- embedded library implementation of set_param_{time,date,datetime} is
much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
- s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
- declarations for TIME and timestamp_type replaced with typedefs
- str_to_datetime arguments moved to mysys headers
sql/time.cc:
- str_to_time and str_to_TIME moved to mysys
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
exported to client.
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
- TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to
MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
- a test case for Bug#4030 "Client side conversion string -> date type
doesn't work (prepared statements)"
2004-06-24 17:08:36 +02:00
|
|
|
MYSQL_TIMESTAMP_DATETIME);
|
2003-11-03 13:01:59 +01:00
|
|
|
|
|
|
|
/* Variables that are bits in THD */
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_autocommit("autocommit", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_autocommit,
|
|
|
|
OPTION_NOT_AUTOCOMMIT,
|
|
|
|
1);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_big_tables("big_tables", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_BIG_TABLES);
|
|
|
|
#ifndef TO_BE_DELETED /* Alias for big_tables */
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_sql_big_tables("sql_big_tables", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_BIG_TABLES);
|
|
|
|
#endif
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_big_selects("sql_big_selects", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
2003-03-19 16:25:59 +01:00
|
|
|
OPTION_BIG_SELECTS);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_log_off("sql_log_off", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_LOG_OFF);
|
|
|
|
static sys_var_thd_bit sys_log_update("sql_log_update",
|
2004-03-27 01:07:09 +01:00
|
|
|
check_log_update,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_log_update,
|
|
|
|
OPTION_UPDATE_LOG);
|
|
|
|
static sys_var_thd_bit sys_log_binlog("sql_log_bin",
|
2004-03-27 01:07:09 +01:00
|
|
|
check_log_update,
|
|
|
|
set_log_update,
|
|
|
|
OPTION_BIN_LOG);
|
|
|
|
static sys_var_thd_bit sys_sql_warnings("sql_warnings", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_WARNINGS);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_auto_is_null("sql_auto_is_null", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_AUTO_IS_NULL);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_safe_updates("sql_safe_updates", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_SAFE_UPDATES);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_buffer_results("sql_buffer_result", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_BUFFER_RESULT);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_quote_show_create("sql_quote_show_create", 0,
|
2002-07-23 17:31:22 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_QUOTE_SHOW_CREATE);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_foreign_key_checks("foreign_key_checks", 0,
|
2002-08-08 02:12:02 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_NO_FOREIGN_KEY_CHECKS,
|
|
|
|
1);
|
2004-03-27 01:07:09 +01:00
|
|
|
static sys_var_thd_bit sys_unique_checks("unique_checks", 0,
|
2002-08-08 02:12:02 +02:00
|
|
|
set_option_bit,
|
|
|
|
OPTION_RELAXED_UNIQUE_CHECKS,
|
|
|
|
1);
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/* Local state variables */
|
|
|
|
|
2002-12-20 13:58:27 +01:00
|
|
|
static sys_var_thd_ha_rows sys_select_limit("sql_select_limit",
|
2002-07-23 17:31:22 +02:00
|
|
|
&SV::select_limit);
|
|
|
|
static sys_var_timestamp sys_timestamp("timestamp");
|
|
|
|
static sys_var_last_insert_id sys_last_insert_id("last_insert_id");
|
|
|
|
static sys_var_last_insert_id sys_identity("identity");
|
|
|
|
static sys_var_insert_id sys_insert_id("insert_id");
|
2002-10-02 12:33:08 +02:00
|
|
|
static sys_var_readonly sys_error_count("error_count",
|
|
|
|
OPT_SESSION,
|
|
|
|
SHOW_LONG,
|
|
|
|
get_error_count);
|
|
|
|
static sys_var_readonly sys_warning_count("warning_count",
|
|
|
|
OPT_SESSION,
|
|
|
|
SHOW_LONG,
|
|
|
|
get_warning_count);
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/* alias for last_insert_id() to be compatible with Sybase */
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-07-23 17:31:22 +02:00
|
|
|
static sys_var_slave_skip_counter sys_slave_skip_counter("sql_slave_skip_counter");
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2002-11-07 03:02:37 +01:00
|
|
|
static sys_var_rand_seed1 sys_rand_seed1("rand_seed1");
|
|
|
|
static sys_var_rand_seed2 sys_rand_seed2("rand_seed2");
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2003-02-19 13:05:35 +01:00
|
|
|
static sys_var_thd_ulong sys_default_week_format("default_week_format",
|
|
|
|
&SV::default_week_format);
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2003-04-02 15:16:19 +02:00
|
|
|
sys_var_thd_ulong sys_group_concat_max_len("group_concat_max_len",
|
|
|
|
&SV::group_concat_max_len);
|
|
|
|
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
sys_var_thd_time_zone sys_time_zone("time_zone");
|
2004-03-06 09:43:35 +01:00
|
|
|
|
|
|
|
/* Read only variables */
|
|
|
|
|
|
|
|
sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE);
|
2004-03-02 14:01:50 +01:00
|
|
|
/* Global read-only variable describing server license */
|
2004-05-25 01:28:44 +02:00
|
|
|
sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE));
|
2004-03-02 14:01:50 +01:00
|
|
|
|
2004-03-06 09:43:35 +01:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
List of all variables for initialisation and storage in hash
|
|
|
|
This is sorted in alphabetical order to make it easy to add new variables
|
|
|
|
|
|
|
|
If the variable is not in this list, it can't be changed with
|
|
|
|
SET variable_name=
|
|
|
|
*/
|
|
|
|
|
|
|
|
sys_var *sys_variables[]=
|
|
|
|
{
|
|
|
|
&sys_auto_is_null,
|
|
|
|
&sys_autocommit,
|
|
|
|
&sys_big_tables,
|
|
|
|
&sys_big_selects,
|
|
|
|
&sys_binlog_cache_size,
|
|
|
|
&sys_buffer_results,
|
|
|
|
&sys_bulk_insert_buff_size,
|
2003-05-30 10:03:56 +02:00
|
|
|
&sys_character_set_server,
|
|
|
|
&sys_character_set_database,
|
2003-05-21 14:44:12 +02:00
|
|
|
&sys_character_set_client,
|
2003-05-30 10:24:24 +02:00
|
|
|
&sys_character_set_connection,
|
2003-05-21 14:44:12 +02:00
|
|
|
&sys_character_set_results,
|
2003-04-23 15:19:22 +02:00
|
|
|
&sys_collation_connection,
|
2003-09-15 13:31:04 +02:00
|
|
|
&sys_collation_database,
|
|
|
|
&sys_collation_server,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_concurrent_insert,
|
|
|
|
&sys_connect_timeout,
|
2003-11-03 13:01:59 +01:00
|
|
|
&sys_date_format,
|
|
|
|
&sys_datetime_format,
|
2003-02-19 13:05:35 +01:00
|
|
|
&sys_default_week_format,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_delay_key_write,
|
|
|
|
&sys_delayed_insert_limit,
|
|
|
|
&sys_delayed_insert_timeout,
|
|
|
|
&sys_delayed_queue_size,
|
2002-10-02 12:33:08 +02:00
|
|
|
&sys_error_count,
|
2003-03-11 10:49:06 +01:00
|
|
|
&sys_expire_logs_days,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_flush,
|
|
|
|
&sys_flush_time,
|
2004-02-16 18:53:00 +01:00
|
|
|
&sys_ft_boolean_syntax,
|
2002-08-08 02:12:02 +02:00
|
|
|
&sys_foreign_key_checks,
|
2003-04-02 15:16:19 +02:00
|
|
|
&sys_group_concat_max_len,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_identity,
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
&sys_init_connect,
|
|
|
|
&sys_init_slave,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_insert_id,
|
|
|
|
&sys_interactive_timeout,
|
|
|
|
&sys_join_buffer_size,
|
|
|
|
&sys_key_buffer_size,
|
2003-08-02 11:43:18 +02:00
|
|
|
&sys_key_cache_block_size,
|
2003-08-09 20:12:22 +02:00
|
|
|
&sys_key_cache_division_limit,
|
|
|
|
&sys_key_cache_age_threshold,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_last_insert_id,
|
2004-03-06 09:43:35 +01:00
|
|
|
&sys_license,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_local_infile,
|
|
|
|
&sys_log_binlog,
|
|
|
|
&sys_log_off,
|
|
|
|
&sys_log_update,
|
|
|
|
&sys_log_warnings,
|
|
|
|
&sys_long_query_time,
|
|
|
|
&sys_low_priority_updates,
|
|
|
|
&sys_max_allowed_packet,
|
|
|
|
&sys_max_binlog_cache_size,
|
|
|
|
&sys_max_binlog_size,
|
|
|
|
&sys_max_connect_errors,
|
|
|
|
&sys_max_connections,
|
|
|
|
&sys_max_delayed_threads,
|
2002-10-02 12:33:08 +02:00
|
|
|
&sys_max_error_count,
|
2004-03-04 18:58:36 +01:00
|
|
|
&sys_max_insert_delayed_threads,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_max_heap_table_size,
|
|
|
|
&sys_max_join_size,
|
2003-04-24 13:33:33 +02:00
|
|
|
&sys_max_length_for_sort_data,
|
2003-07-06 17:59:54 +02:00
|
|
|
&sys_max_relay_log_size,
|
2003-06-27 02:04:54 +02:00
|
|
|
&sys_max_seeks_for_key,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_max_sort_length,
|
|
|
|
&sys_max_tmp_tables,
|
|
|
|
&sys_max_user_connections,
|
|
|
|
&sys_max_write_lock_count,
|
2004-05-01 15:41:59 +02:00
|
|
|
&sys_myisam_data_pointer_size,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_myisam_max_extra_sort_file_size,
|
|
|
|
&sys_myisam_max_sort_file_size,
|
2003-05-04 18:43:37 +02:00
|
|
|
&sys_myisam_repair_threads,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_myisam_sort_buffer_size,
|
|
|
|
&sys_net_buffer_length,
|
|
|
|
&sys_net_read_timeout,
|
2002-08-08 19:49:06 +02:00
|
|
|
&sys_net_retry_count,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_net_wait_timeout,
|
|
|
|
&sys_net_write_timeout,
|
2003-03-05 18:43:56 +01:00
|
|
|
&sys_new_mode,
|
2003-07-08 00:36:14 +02:00
|
|
|
&sys_old_passwords,
|
2003-06-12 13:29:02 +02:00
|
|
|
&sys_preload_buff_size,
|
2002-12-29 22:46:48 +01:00
|
|
|
&sys_pseudo_thread_id,
|
2003-10-11 21:00:24 +02:00
|
|
|
&sys_query_alloc_block_size,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_query_cache_size,
|
2003-10-11 21:00:24 +02:00
|
|
|
&sys_query_prealloc_size,
|
2002-07-23 17:31:22 +02:00
|
|
|
#ifdef HAVE_QUERY_CACHE
|
|
|
|
&sys_query_cache_limit,
|
2003-03-02 20:39:03 +01:00
|
|
|
&sys_query_cache_min_res_unit,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_query_cache_type,
|
2004-03-04 17:32:55 +01:00
|
|
|
&sys_query_cache_wlock_invalidate,
|
2002-08-08 02:12:02 +02:00
|
|
|
#endif /* HAVE_QUERY_CACHE */
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_quote_show_create,
|
2002-11-07 03:02:37 +01:00
|
|
|
&sys_rand_seed1,
|
|
|
|
&sys_rand_seed2,
|
2003-10-14 15:30:42 +02:00
|
|
|
&sys_range_alloc_block_size,
|
2003-11-03 13:01:59 +01:00
|
|
|
&sys_readonly,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_read_buff_size,
|
|
|
|
&sys_read_rnd_buff_size,
|
Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
sql/log.cc:
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT.
sql/log_event.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/mysql_priv.h:
new option relay_log_purge (the user can now decide himself
if he wants his relay logs to be automatically purged or not,
we don't make unsafe guesses like before)
sql/mysqld.cc:
new option --innodb (replaces --skip-innodb).
Useful for the test suite : we have skip-innodb in mysql-test-run,
but we can ('-opt.info' file) choose to start the server with
InnoDB for this test only.
New option --bdb
sql/repl_failsafe.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/set_var.cc:
new variable relay_log_purge
sql/slave.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Now we purge a relay log only when we are sure we won't need it,
i.e. we have executed the final query (if autocommit=1) or the COMMIT
sql/slave.h:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
sql/sql_class.h:
prototypes change
sql/sql_parse.cc:
removed thd argument (was not used in the function's body)
sql/sql_repl.cc:
Better tracking of the relay log's name and position
lastly executed, even if we are in a transaction which spans on
2 or more relay logs.
Turn relay_log_purge silently off when someone does CHANGE
MASTER TO RELAY_LOG_*
2003-04-24 15:29:25 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
&sys_relay_log_purge,
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_rpl_recovery_rank,
|
|
|
|
&sys_safe_updates,
|
2003-07-08 00:36:14 +02:00
|
|
|
&sys_secure_auth,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_select_limit,
|
|
|
|
&sys_server_id,
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-08-08 02:12:02 +02:00
|
|
|
&sys_slave_compressed_protocol,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_slave_net_timeout,
|
|
|
|
&sys_slave_skip_counter,
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_slow_launch_time,
|
|
|
|
&sys_sort_buffer,
|
|
|
|
&sys_sql_big_tables,
|
|
|
|
&sys_sql_low_priority_updates,
|
|
|
|
&sys_sql_max_join_size,
|
2003-01-16 01:04:50 +01:00
|
|
|
&sys_sql_mode,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_sql_warnings,
|
2003-12-17 23:52:03 +01:00
|
|
|
&sys_storage_engine,
|
2004-06-10 15:56:13 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
&sys_sync_binlog_period,
|
|
|
|
#endif
|
|
|
|
&sys_sync_frm,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_table_cache_size,
|
|
|
|
&sys_table_type,
|
|
|
|
&sys_thread_cache_size,
|
2003-11-03 13:01:59 +01:00
|
|
|
&sys_time_format,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_timestamp,
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
&sys_time_zone,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_tmp_table_size,
|
2003-10-11 21:00:24 +02:00
|
|
|
&sys_trans_alloc_block_size,
|
|
|
|
&sys_trans_prealloc_size,
|
2002-07-23 17:31:22 +02:00
|
|
|
&sys_tx_isolation,
|
2004-03-06 09:43:35 +01:00
|
|
|
&sys_os,
|
2003-05-04 12:41:21 +02:00
|
|
|
#ifdef HAVE_INNOBASE_DB
|
|
|
|
&sys_innodb_max_dirty_pages_pct,
|
2004-10-20 10:24:08 +02:00
|
|
|
&sys_innodb_table_locks,
|
2004-09-30 14:54:19 +02:00
|
|
|
&sys_innodb_max_purge_lag,
|
2004-09-30 11:31:41 +02:00
|
|
|
&sys_innodb_autoextend_increment,
|
2003-05-04 12:41:21 +02:00
|
|
|
#endif
|
2002-10-02 12:33:08 +02:00
|
|
|
&sys_unique_checks,
|
|
|
|
&sys_warning_count
|
2002-07-23 17:31:22 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Variables shown by SHOW variables in alphabetical order
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct show_var_st init_vars[]= {
|
|
|
|
{"back_log", (char*) &back_log, SHOW_LONG},
|
|
|
|
{"basedir", mysql_home, SHOW_CHAR},
|
|
|
|
#ifdef HAVE_BERKELEY_DB
|
|
|
|
{"bdb_cache_size", (char*) &berkeley_cache_size, SHOW_LONG},
|
|
|
|
{"bdb_home", (char*) &berkeley_home, SHOW_CHAR_PTR},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"bdb_log_buffer_size", (char*) &berkeley_log_buffer_size, SHOW_LONG},
|
2004-07-28 21:52:04 +02:00
|
|
|
{"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"bdb_max_lock", (char*) &berkeley_max_lock, SHOW_LONG},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"bdb_shared_data", (char*) &berkeley_shared_data, SHOW_BOOL},
|
|
|
|
{"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR},
|
|
|
|
#endif
|
|
|
|
{sys_binlog_cache_size.name,(char*) &sys_binlog_cache_size, SHOW_SYS},
|
|
|
|
{sys_bulk_insert_buff_size.name,(char*) &sys_bulk_insert_buff_size,SHOW_SYS},
|
2003-10-08 17:53:31 +02:00
|
|
|
{sys_character_set_client.name,(char*) &sys_character_set_client, SHOW_SYS},
|
2003-05-30 10:24:24 +02:00
|
|
|
{sys_character_set_connection.name,(char*) &sys_character_set_connection,SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_character_set_database.name, (char*) &sys_character_set_database,SHOW_SYS},
|
2003-05-21 14:44:12 +02:00
|
|
|
{sys_character_set_results.name,(char*) &sys_character_set_results, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_character_set_server.name, (char*) &sys_character_set_server,SHOW_SYS},
|
|
|
|
{sys_charset_system.name, (char*) &sys_charset_system, SHOW_SYS},
|
2004-03-25 03:30:49 +01:00
|
|
|
{"character_sets_dir", mysql_charsets_dir, SHOW_CHAR},
|
2003-04-23 15:19:22 +02:00
|
|
|
{sys_collation_connection.name,(char*) &sys_collation_connection, SHOW_SYS},
|
2003-09-15 13:31:04 +02:00
|
|
|
{sys_collation_database.name,(char*) &sys_collation_database, SHOW_SYS},
|
|
|
|
{sys_collation_server.name,(char*) &sys_collation_server, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_concurrent_insert.name,(char*) &sys_concurrent_insert, SHOW_SYS},
|
|
|
|
{sys_connect_timeout.name, (char*) &sys_connect_timeout, SHOW_SYS},
|
|
|
|
{"datadir", mysql_real_data_home, SHOW_CHAR},
|
2003-11-03 13:01:59 +01:00
|
|
|
{sys_date_format.name, (char*) &sys_date_format, SHOW_SYS},
|
|
|
|
{sys_datetime_format.name, (char*) &sys_datetime_format, SHOW_SYS},
|
|
|
|
{sys_default_week_format.name, (char*) &sys_default_week_format, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_delay_key_write.name, (char*) &sys_delay_key_write, SHOW_SYS},
|
|
|
|
{sys_delayed_insert_limit.name, (char*) &sys_delayed_insert_limit,SHOW_SYS},
|
|
|
|
{sys_delayed_insert_timeout.name, (char*) &sys_delayed_insert_timeout, SHOW_SYS},
|
|
|
|
{sys_delayed_queue_size.name,(char*) &sys_delayed_queue_size, SHOW_SYS},
|
2003-03-11 10:49:06 +01:00
|
|
|
{sys_expire_logs_days.name, (char*) &sys_expire_logs_days, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_flush.name, (char*) &sys_flush, SHOW_SYS},
|
|
|
|
{sys_flush_time.name, (char*) &sys_flush_time, SHOW_SYS},
|
2004-02-16 18:53:00 +01:00
|
|
|
{sys_ft_boolean_syntax.name,(char*) &ft_boolean_syntax, SHOW_CHAR},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"ft_max_word_len", (char*) &ft_max_word_len, SHOW_LONG},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"ft_min_word_len", (char*) &ft_min_word_len, SHOW_LONG},
|
2003-10-23 15:21:06 +02:00
|
|
|
{"ft_query_expansion_limit",(char*) &ft_query_expansion_limit, SHOW_LONG},
|
2003-01-27 12:12:12 +01:00
|
|
|
{"ft_stopword_file", (char*) &ft_stopword_file, SHOW_CHAR_PTR},
|
2004-04-03 23:05:31 +02:00
|
|
|
{sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len, SHOW_SYS},
|
2004-05-25 22:27:01 +02:00
|
|
|
{"have_archive", (char*) &have_archive_db, SHOW_HAVE},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE},
|
2003-04-10 02:50:30 +02:00
|
|
|
{"have_compress", (char*) &have_compress, SHOW_HAVE},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"have_crypt", (char*) &have_crypt, SHOW_HAVE},
|
2004-08-13 05:57:18 +02:00
|
|
|
{"have_csv", (char*) &have_csv_db, SHOW_HAVE},
|
2004-08-14 01:24:46 +02:00
|
|
|
{"have_example_engine", (char*) &have_example_db, SHOW_HAVE},
|
2004-07-28 21:52:04 +02:00
|
|
|
{"have_geometry", (char*) &have_geometry, SHOW_HAVE},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"have_innodb", (char*) &have_innodb, SHOW_HAVE},
|
2003-10-23 15:21:06 +02:00
|
|
|
{"have_isam", (char*) &have_isam, SHOW_HAVE},
|
2004-04-15 09:14:14 +02:00
|
|
|
{"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"have_openssl", (char*) &have_openssl, SHOW_HAVE},
|
|
|
|
{"have_query_cache", (char*) &have_query_cache, SHOW_HAVE},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"have_raid", (char*) &have_raid, SHOW_HAVE},
|
2004-05-27 17:31:30 +02:00
|
|
|
{"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"have_symlink", (char*) &have_symlink, SHOW_HAVE},
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
{"init_connect", (char*) &sys_init_connect, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"init_file", (char*) &opt_init_file, SHOW_CHAR_PTR},
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
{"init_slave", (char*) &sys_init_slave, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
#ifdef HAVE_INNOBASE_DB
|
|
|
|
{"innodb_additional_mem_pool_size", (char*) &innobase_additional_mem_pool_size, SHOW_LONG },
|
2004-09-30 11:31:41 +02:00
|
|
|
{sys_innodb_autoextend_increment.name, (char*) &sys_innodb_autoextend_increment, SHOW_SYS},
|
2003-01-06 21:07:25 +01:00
|
|
|
{"innodb_buffer_pool_awe_mem_mb", (char*) &innobase_buffer_pool_awe_mem_mb, SHOW_LONG },
|
2004-03-08 03:19:37 +01:00
|
|
|
{"innodb_buffer_pool_size", (char*) &innobase_buffer_pool_size, SHOW_LONG },
|
2002-07-23 17:31:22 +02:00
|
|
|
{"innodb_data_file_path", (char*) &innobase_data_file_path, SHOW_CHAR_PTR},
|
|
|
|
{"innodb_data_home_dir", (char*) &innobase_data_home_dir, SHOW_CHAR_PTR},
|
|
|
|
{"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },
|
2003-10-07 16:28:59 +02:00
|
|
|
{"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},
|
2004-07-20 13:15:38 +02:00
|
|
|
{"innodb_locks_unsafe_for_binlog", (char*) &innobase_locks_unsafe_for_binlog, SHOW_MY_BOOL},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"innodb_flush_log_at_trx_commit", (char*) &innobase_flush_log_at_trx_commit, SHOW_INT},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"innodb_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG },
|
2002-07-23 17:31:22 +02:00
|
|
|
{"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG },
|
|
|
|
{"innodb_log_arch_dir", (char*) &innobase_log_arch_dir, SHOW_CHAR_PTR},
|
|
|
|
{"innodb_log_archive", (char*) &innobase_log_archive, SHOW_MY_BOOL},
|
|
|
|
{"innodb_log_buffer_size", (char*) &innobase_log_buffer_size, SHOW_LONG },
|
|
|
|
{"innodb_log_file_size", (char*) &innobase_log_file_size, SHOW_LONG},
|
|
|
|
{"innodb_log_files_in_group", (char*) &innobase_log_files_in_group, SHOW_LONG},
|
|
|
|
{"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},
|
2003-05-04 12:41:21 +02:00
|
|
|
{sys_innodb_max_dirty_pages_pct.name, (char*) &sys_innodb_max_dirty_pages_pct, SHOW_SYS},
|
2004-10-20 10:24:08 +02:00
|
|
|
{sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},
|
2004-09-30 14:54:19 +02:00
|
|
|
{sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},
|
|
|
|
{"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG },
|
|
|
|
{"innodb_thread_concurrency", (char*) &innobase_thread_concurrency, SHOW_LONG },
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif
|
|
|
|
{sys_interactive_timeout.name,(char*) &sys_interactive_timeout, SHOW_SYS},
|
|
|
|
{sys_join_buffer_size.name, (char*) &sys_join_buffer_size, SHOW_SYS},
|
|
|
|
{sys_key_buffer_size.name, (char*) &sys_key_buffer_size, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_key_cache_age_threshold.name, (char*) &sys_key_cache_age_threshold,
|
2004-03-20 14:36:00 +01:00
|
|
|
SHOW_SYS},
|
2003-08-02 11:43:18 +02:00
|
|
|
{sys_key_cache_block_size.name, (char*) &sys_key_cache_block_size,
|
2004-03-20 14:36:00 +01:00
|
|
|
SHOW_SYS},
|
2003-08-09 20:12:22 +02:00
|
|
|
{sys_key_cache_division_limit.name, (char*) &sys_key_cache_division_limit,
|
2004-03-20 14:36:00 +01:00
|
|
|
SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"language", language, SHOW_CHAR},
|
2004-03-06 09:43:35 +01:00
|
|
|
{"large_files_support", (char*) &opt_large_files, SHOW_BOOL},
|
|
|
|
{sys_license.name, (char*) &sys_license, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_local_infile.name, (char*) &sys_local_infile, SHOW_SYS},
|
|
|
|
#ifdef HAVE_MLOCKALL
|
|
|
|
{"locked_in_memory", (char*) &locked_in_memory, SHOW_BOOL},
|
|
|
|
#endif
|
|
|
|
{"log", (char*) &opt_log, SHOW_BOOL},
|
|
|
|
{"log_bin", (char*) &opt_bin_log, SHOW_BOOL},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"log_error", (char*) log_error_file, SHOW_CHAR},
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-08-28 18:22:42 +02:00
|
|
|
{"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL},
|
2002-12-16 14:33:29 +01:00
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
{"log_slow_queries", (char*) &opt_slow_log, SHOW_BOOL},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"log_update", (char*) &opt_update_log, SHOW_BOOL},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_log_warnings.name, (char*) &sys_log_warnings, SHOW_SYS},
|
|
|
|
{sys_long_query_time.name, (char*) &sys_long_query_time, SHOW_SYS},
|
|
|
|
{sys_low_priority_updates.name, (char*) &sys_low_priority_updates, SHOW_SYS},
|
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
VC++Files/bdb/bdb.dsp:
Small, automatic changes
VC++Files/client/mysql.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
Automatic changes
VC++Files/dbug/dbug.dsp:
Automatic changes
VC++Files/heap/heap.dsp:
automatic changes
VC++Files/innobase/innobase.dsp:
Automatic changes
VC++Files/isam/isam.dsp:
Automatic changes
VC++Files/isamchk/isamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Add missing files
VC++Files/libmysqld/libmysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
Automatic changes
VC++Files/merge/merge.dsp:
Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
automatic changes
VC++Files/myisamchk/myisamchk.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
Automatic changes
VC++Files/mysys/mysys.dsp:
Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
Automatic changes
VC++Files/replace/replace.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
Automatic changes
VC++Files/thr_test/thr_test.dsp:
Automatic changes
VC++Files/vio/vio.dsp:
Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
Automatic changes
VC++Files/zlib/zlib.dsp:
Automatic changes
extra/my_print_defaults.c:
Fixed bug in --verbose
include/m_string.h:
Portability fix
include/mysql_embed.h:
Better setting of server_version variable
include/mysql_version.h.in:
Better license text handling
innobase/pars/pars0lex.l:
Remove compiler warnings
innobase/trx/trx0sys.c:
Remove compiler warnings
libmysqld/lib_sql.cc:
Better setting of server_version variable
libmysqld/libmysqld.def:
Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
Remove compiler warnings
mysys/sha1.c:
Remove compiler warnings
scripts/make_win_src_distribution.sh:
Safety fix
scripts/mysql_install_db.sh:
Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
Add new file mysqld_suffix.h
Remove not used file sql_olap.h
sql/ha_innodb.cc:
Remove not used variable
sql/mysqld.cc:
Better setting of server_version variable
sql/set_var.cc:
Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
Remove compiler warnings
2004-05-19 15:38:12 +02:00
|
|
|
{"lower_case_file_system", (char*) &lower_case_file_system, SHOW_MY_BOOL},
|
2003-12-30 12:14:21 +01:00
|
|
|
{"lower_case_table_names", (char*) &lower_case_table_names, SHOW_INT},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_allowed_packet.name,(char*) &sys_max_allowed_packet, SHOW_SYS},
|
|
|
|
{sys_max_binlog_cache_size.name,(char*) &sys_max_binlog_cache_size, SHOW_SYS},
|
|
|
|
{sys_max_binlog_size.name, (char*) &sys_max_binlog_size, SHOW_SYS},
|
|
|
|
{sys_max_connect_errors.name, (char*) &sys_max_connect_errors, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_max_connections.name, (char*) &sys_max_connections, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_max_error_count.name, (char*) &sys_max_error_count, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size, SHOW_SYS},
|
2004-03-25 03:30:49 +01:00
|
|
|
{sys_max_insert_delayed_threads.name,
|
|
|
|
(char*) &sys_max_insert_delayed_threads, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_join_size.name, (char*) &sys_max_join_size, SHOW_SYS},
|
2003-08-11 21:44:43 +02:00
|
|
|
{sys_max_length_for_sort_data.name, (char*) &sys_max_length_for_sort_data,
|
2003-04-24 13:33:33 +02:00
|
|
|
SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_max_relay_log_size.name, (char*) &sys_max_relay_log_size, SHOW_SYS},
|
|
|
|
{sys_max_seeks_for_key.name, (char*) &sys_max_seeks_for_key, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_sort_length.name, (char*) &sys_max_sort_length, SHOW_SYS},
|
2003-05-04 18:43:37 +02:00
|
|
|
{sys_max_tmp_tables.name, (char*) &sys_max_tmp_tables, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_max_write_lock_count.name, (char*) &sys_max_write_lock_count,SHOW_SYS},
|
2004-05-01 15:41:59 +02:00
|
|
|
{sys_myisam_data_pointer_size.name, (char*) &sys_myisam_data_pointer_size, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_myisam_max_extra_sort_file_size.name,
|
|
|
|
(char*) &sys_myisam_max_extra_sort_file_size,
|
|
|
|
SHOW_SYS},
|
2003-05-04 18:43:37 +02:00
|
|
|
{sys_myisam_max_sort_file_size.name, (char*) &sys_myisam_max_sort_file_size,
|
|
|
|
SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"myisam_recover_options", (char*) &myisam_recover_options_str, SHOW_CHAR_PTR},
|
2003-05-04 18:43:37 +02:00
|
|
|
{sys_myisam_repair_threads.name, (char*) &sys_myisam_repair_threads,
|
2002-07-23 17:31:22 +02:00
|
|
|
SHOW_SYS},
|
|
|
|
{sys_myisam_sort_buffer_size.name, (char*) &sys_myisam_sort_buffer_size, SHOW_SYS},
|
|
|
|
#ifdef __NT__
|
2002-08-28 18:22:42 +02:00
|
|
|
{"named_pipe", (char*) &opt_enable_named_pipe, SHOW_MY_BOOL},
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif
|
|
|
|
{sys_net_buffer_length.name,(char*) &sys_net_buffer_length, SHOW_SYS},
|
|
|
|
{sys_net_read_timeout.name, (char*) &sys_net_read_timeout, SHOW_SYS},
|
2002-08-08 19:49:06 +02:00
|
|
|
{sys_net_retry_count.name, (char*) &sys_net_retry_count, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_net_write_timeout.name,(char*) &sys_net_write_timeout, SHOW_SYS},
|
2003-03-05 18:43:56 +01:00
|
|
|
{sys_new_mode.name, (char*) &sys_new_mode, SHOW_SYS},
|
2003-07-08 00:36:14 +02:00
|
|
|
{sys_old_passwords.name, (char*) &sys_old_passwords, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"open_files_limit", (char*) &open_files_limit, SHOW_LONG},
|
|
|
|
{"pid_file", (char*) pidfile_name, SHOW_CHAR},
|
2003-06-14 10:37:42 +02:00
|
|
|
{"port", (char*) &mysqld_port, SHOW_INT},
|
2003-06-12 13:29:02 +02:00
|
|
|
{sys_preload_buff_size.name, (char*) &sys_preload_buff_size, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"protocol_version", (char*) &protocol_version, SHOW_INT},
|
2003-10-11 21:00:24 +02:00
|
|
|
{sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size,
|
|
|
|
SHOW_SYS},
|
2002-07-28 21:36:34 +02:00
|
|
|
#ifdef HAVE_QUERY_CACHE
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_query_cache_limit.name,(char*) &sys_query_cache_limit, SHOW_SYS},
|
2003-03-02 20:39:03 +01:00
|
|
|
{sys_query_cache_min_res_unit.name, (char*) &sys_query_cache_min_res_unit,
|
|
|
|
SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_query_cache_size.name, (char*) &sys_query_cache_size, SHOW_SYS},
|
|
|
|
{sys_query_cache_type.name, (char*) &sys_query_cache_type, SHOW_SYS},
|
2004-08-13 21:31:30 +02:00
|
|
|
{sys_query_cache_wlock_invalidate.name,
|
|
|
|
(char *) &sys_query_cache_wlock_invalidate, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif /* HAVE_QUERY_CACHE */
|
2003-10-11 21:00:24 +02:00
|
|
|
{sys_query_prealloc_size.name, (char*) &sys_query_prealloc_size, SHOW_SYS},
|
2003-10-14 15:30:42 +02:00
|
|
|
{sys_range_alloc_block_size.name, (char*) &sys_range_alloc_block_size,
|
|
|
|
SHOW_SYS},
|
2003-08-21 10:44:17 +02:00
|
|
|
{sys_read_buff_size.name, (char*) &sys_read_buff_size, SHOW_SYS},
|
|
|
|
{sys_readonly.name, (char*) &sys_readonly, SHOW_SYS},
|
|
|
|
{sys_read_rnd_buff_size.name,(char*) &sys_read_rnd_buff_size, SHOW_SYS},
|
2003-08-29 12:44:35 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
{sys_relay_log_purge.name, (char*) &sys_relay_log_purge, SHOW_SYS},
|
|
|
|
#endif
|
2003-08-21 10:44:17 +02:00
|
|
|
{sys_rpl_recovery_rank.name,(char*) &sys_rpl_recovery_rank, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{"secure_auth", (char*) &sys_secure_auth, SHOW_SYS},
|
2002-11-14 20:16:30 +01:00
|
|
|
#ifdef HAVE_SMEM
|
|
|
|
{"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL},
|
|
|
|
{"shared_memory_base_name", (char*) &shared_memory_base_name, SHOW_CHAR_PTR},
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_server_id.name, (char*) &sys_server_id, SHOW_SYS},
|
2002-07-24 18:55:08 +02:00
|
|
|
{"skip_external_locking", (char*) &my_disable_locking, SHOW_MY_BOOL},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL},
|
|
|
|
{"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL},
|
2004-03-08 03:19:37 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
{sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS},
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_slow_launch_time.name, (char*) &sys_slow_launch_time, SHOW_SYS},
|
2002-11-05 21:45:42 +01:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
2003-06-14 10:37:42 +02:00
|
|
|
{"socket", (char*) &mysqld_unix_port, SHOW_CHAR_PTR},
|
2002-11-05 21:45:42 +01:00
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_sort_buffer.name, (char*) &sys_sort_buffer, SHOW_SYS},
|
2003-01-16 01:04:50 +01:00
|
|
|
{sys_sql_mode.name, (char*) &sys_sql_mode, SHOW_SYS},
|
2003-12-17 23:52:03 +01:00
|
|
|
{sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS},
|
2004-06-10 15:56:13 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
{sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period, SHOW_SYS},
|
|
|
|
#endif
|
|
|
|
{sys_sync_frm.name, (char*) &sys_sync_frm, SHOW_SYS},
|
2004-07-10 13:21:44 +02:00
|
|
|
#ifdef HAVE_TZNAME
|
|
|
|
{"system_time_zone", system_time_zone, SHOW_CHAR},
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
{"table_cache", (char*) &table_cache_size, SHOW_LONG},
|
|
|
|
{sys_table_type.name, (char*) &sys_table_type, SHOW_SYS},
|
|
|
|
{sys_thread_cache_size.name,(char*) &sys_thread_cache_size, SHOW_SYS},
|
|
|
|
#ifdef HAVE_THR_SETCONCURRENCY
|
|
|
|
{"thread_concurrency", (char*) &concurrency, SHOW_LONG},
|
|
|
|
#endif
|
|
|
|
{"thread_stack", (char*) &thread_stack, SHOW_LONG},
|
2003-11-03 13:01:59 +01:00
|
|
|
{sys_time_format.name, (char*) &sys_time_format, SHOW_SYS},
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
{"time_zone", (char*) &sys_time_zone, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_tmp_table_size.name, (char*) &sys_tmp_table_size, SHOW_SYS},
|
2002-10-08 14:39:37 +02:00
|
|
|
{"tmpdir", (char*) &opt_mysql_tmpdir, SHOW_CHAR_PTR},
|
2003-10-11 21:00:24 +02:00
|
|
|
{sys_trans_alloc_block_size.name, (char*) &sys_trans_alloc_block_size,
|
|
|
|
SHOW_SYS},
|
|
|
|
{sys_trans_prealloc_size.name, (char*) &sys_trans_prealloc_size, SHOW_SYS},
|
2004-03-08 03:19:37 +01:00
|
|
|
{sys_tx_isolation.name, (char*) &sys_tx_isolation, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{"version", server_version, SHOW_CHAR},
|
2003-11-28 11:18:13 +01:00
|
|
|
#ifdef HAVE_BERKELEY_DB
|
|
|
|
{"version_bdb", (char*) DB_VERSION_STRING, SHOW_CHAR},
|
|
|
|
#endif
|
2003-11-26 02:30:00 +01:00
|
|
|
{"version_comment", (char*) MYSQL_COMPILATION_COMMENT, SHOW_CHAR},
|
2003-11-28 11:18:13 +01:00
|
|
|
{"version_compile_machine", (char*) MACHINE_TYPE, SHOW_CHAR},
|
2004-03-06 09:43:35 +01:00
|
|
|
{sys_os.name, (char*) &sys_os, SHOW_SYS},
|
2002-07-23 17:31:22 +02:00
|
|
|
{sys_net_wait_timeout.name, (char*) &sys_net_wait_timeout, SHOW_SYS},
|
|
|
|
{NullS, NullS, SHOW_LONG}
|
|
|
|
};
|
|
|
|
|
2003-10-20 10:24:18 +02:00
|
|
|
|
2003-10-24 16:28:32 +02:00
|
|
|
bool sys_var::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
var->save_result.ulonglong_value= var->value->val_int();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-02-16 18:53:00 +01:00
|
|
|
bool sys_var_str::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
if (!check_func)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if ((res=(*check_func)(thd, var)) < 0)
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name,
|
|
|
|
var->value->str_value.ptr());
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
Functions to check and update variables
|
|
|
|
*/
|
|
|
|
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
/*
|
|
|
|
Update variables 'init_connect, init_slave'.
|
|
|
|
|
|
|
|
In case of 'DEFAULT' value
|
|
|
|
(for example: 'set GLOBAL init_connect=DEFAULT')
|
|
|
|
'var' parameter is NULL pointer.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex,
|
|
|
|
set_var *var)
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
{
|
2004-03-20 17:08:01 +01:00
|
|
|
char *res= 0, *old_value=(char *)(var ? var->value->str_value.ptr() : 0);
|
|
|
|
uint new_length= (var ? var->value->str_value.length() : 0);
|
2004-04-05 12:56:05 +02:00
|
|
|
if (!old_value)
|
|
|
|
old_value= (char*) "";
|
2004-05-06 19:55:12 +02:00
|
|
|
if (!(res= my_strdup_with_length((byte*)old_value, new_length, MYF(0))))
|
2004-03-20 17:08:01 +01:00
|
|
|
return 1;
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
/*
|
|
|
|
Replace the old value in such a way that the any thread using
|
|
|
|
the value will work.
|
|
|
|
*/
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
rw_wrlock(var_mutex);
|
|
|
|
old_value= var_str->value;
|
|
|
|
var_str->value= res;
|
|
|
|
var_str->value_length= new_length;
|
|
|
|
rw_unlock(var_mutex);
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
my_free(old_value, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
static bool sys_update_init_connect(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
return update_sys_var_str(&sys_init_connect, &LOCK_sys_init_connect, var);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
static void sys_default_init_connect(THD* thd, enum_var_type type)
|
|
|
|
{
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
update_sys_var_str(&sys_init_connect, &LOCK_sys_init_connect, 0);
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool sys_update_init_slave(THD *thd, set_var *var)
|
|
|
|
{
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
return update_sys_var_str(&sys_init_slave, &LOCK_sys_init_slave, var);
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void sys_default_init_slave(THD* thd, enum_var_type type)
|
|
|
|
{
|
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.
2003-12-08 06:13:14 +01:00
|
|
|
update_sys_var_str(&sys_init_slave, &LOCK_sys_init_slave, 0);
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
}
|
|
|
|
|
2004-02-16 18:53:00 +01:00
|
|
|
static int sys_check_ftb_syntax(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if (thd->master_access & SUPER_ACL)
|
2004-02-27 17:27:07 +01:00
|
|
|
return ft_boolean_check_syntax_string((byte*) var->value->str_value.c_ptr()) ?
|
2004-02-19 23:26:05 +01:00
|
|
|
-1 : 0;
|
2004-02-16 18:53:00 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool sys_update_ftb_syntax(THD *thd, set_var * var)
|
|
|
|
{
|
2004-02-19 23:26:05 +01:00
|
|
|
strmake(ft_boolean_syntax, var->value->str_value.c_ptr(),
|
|
|
|
sizeof(ft_boolean_syntax)-1);
|
2004-02-16 18:53:00 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sys_default_ftb_syntax(THD *thd, enum_var_type type)
|
|
|
|
{
|
2004-04-07 20:58:33 +02:00
|
|
|
strmake(ft_boolean_syntax, def_ft_boolean_syntax,
|
2004-02-19 23:26:05 +01:00
|
|
|
sizeof(ft_boolean_syntax)-1);
|
2004-02-16 18:53:00 +01:00
|
|
|
}
|
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'
2003-07-18 11:11:01 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
The following 3 functions need to be changed in 4.1 when we allow
|
|
|
|
one to change character sets
|
|
|
|
*/
|
|
|
|
|
2004-02-16 18:53:00 +01:00
|
|
|
static int sys_check_charset(THD *thd, set_var *var)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool sys_update_charset(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void sys_set_default_charset(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
If one sets the LOW_PRIORIY UPDATES flag, we also must change the
|
|
|
|
used lock type
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void fix_low_priority_updates(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
thd->update_lock_default= (thd->variables.low_priority_updates ?
|
|
|
|
TL_WRITE_LOW_PRIORITY : TL_WRITE);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-13 18:34:51 +02:00
|
|
|
static void
|
|
|
|
fix_myisam_max_extra_sort_file_size(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
myisam_max_extra_temp_length=
|
2003-05-13 21:28:34 +02:00
|
|
|
(my_off_t) global_system_variables.myisam_max_extra_sort_file_size;
|
2003-05-13 18:34:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
fix_myisam_max_sort_file_size(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
myisam_max_temp_length=
|
|
|
|
(my_off_t) global_system_variables.myisam_max_sort_file_size;
|
|
|
|
}
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
Set the OPTION_BIG_SELECTS flag if max_join_size == HA_POS_ERROR
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void fix_max_join_size(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
{
|
2002-12-20 13:58:27 +01:00
|
|
|
if (thd->variables.max_join_size == HA_POS_ERROR)
|
2002-07-23 17:31:22 +02:00
|
|
|
thd->options|= OPTION_BIG_SELECTS;
|
|
|
|
else
|
|
|
|
thd->options&= ~OPTION_BIG_SELECTS;
|
|
|
|
}
|
|
|
|
}
|
2003-10-06 14:11:16 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
If one doesn't use the SESSION modifier, the isolation level
|
|
|
|
is only active for the next command
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void fix_tx_isolation(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_SESSION)
|
|
|
|
thd->session_tx_isolation= ((enum_tx_isolation)
|
|
|
|
thd->variables.tx_isolation);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
If we are changing the thread variable, we have to copy it to NET too
|
|
|
|
*/
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-07-23 17:31:22 +02:00
|
|
|
static void fix_net_read_timeout(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
thd->net.read_timeout=thd->variables.net_read_timeout;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void fix_net_write_timeout(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
thd->net.write_timeout=thd->variables.net_write_timeout;
|
|
|
|
}
|
|
|
|
|
2002-08-08 19:49:06 +02:00
|
|
|
static void fix_net_retry_count(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
thd->net.retry_count=thd->variables.net_retry_count;
|
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#else /* HAVE_REPLICATION */
|
|
|
|
static void fix_net_read_timeout(THD *thd __attribute__(unused),
|
|
|
|
enum_var_type type __attribute__(unused))
|
2002-12-16 14:33:29 +01:00
|
|
|
{}
|
2003-01-15 09:11:44 +01:00
|
|
|
static void fix_net_write_timeout(THD *thd __attribute__(unused),
|
|
|
|
enum_var_type type __attribute__(unused))
|
2002-12-16 14:33:29 +01:00
|
|
|
{}
|
2003-01-15 09:11:44 +01:00
|
|
|
static void fix_net_retry_count(THD *thd __attribute__(unused),
|
|
|
|
enum_var_type type __attribute__(unused))
|
2002-12-16 14:33:29 +01:00
|
|
|
{}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2002-08-08 19:49:06 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
static void fix_query_cache_size(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_QUERY_CACHE
|
2003-10-08 23:13:15 +02:00
|
|
|
ulong requested= query_cache_size;
|
2002-07-23 17:31:22 +02:00
|
|
|
query_cache.resize(query_cache_size);
|
2003-10-08 23:13:15 +02:00
|
|
|
if (requested != query_cache_size)
|
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_WARN_QC_RESIZE, ER(ER_WARN_QC_RESIZE),
|
|
|
|
requested, query_cache_size);
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-02 20:39:03 +01:00
|
|
|
#ifdef HAVE_QUERY_CACHE
|
|
|
|
static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
query_cache_min_res_unit=
|
|
|
|
query_cache.set_min_res_unit(query_cache_min_res_unit);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2003-10-06 14:11:16 +02:00
|
|
|
extern void fix_delay_key_write(THD *thd, enum_var_type type)
|
2002-08-13 01:18:39 +02:00
|
|
|
{
|
|
|
|
switch ((enum_delay_key_write) delay_key_write_options) {
|
|
|
|
case DELAY_KEY_WRITE_NONE:
|
|
|
|
myisam_delay_key_write=0;
|
|
|
|
break;
|
|
|
|
case DELAY_KEY_WRITE_ON:
|
|
|
|
myisam_delay_key_write=1;
|
|
|
|
break;
|
|
|
|
case DELAY_KEY_WRITE_ALL:
|
|
|
|
myisam_delay_key_write=1;
|
|
|
|
ha_open_options|= HA_OPEN_DELAY_KEY_WRITE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-10-06 14:11:16 +02:00
|
|
|
static void fix_max_binlog_size(THD *thd, enum_var_type type)
|
2003-07-06 17:59:54 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("fix_max_binlog_size");
|
|
|
|
DBUG_PRINT("info",("max_binlog_size=%lu max_relay_log_size=%lu",
|
|
|
|
max_binlog_size, max_relay_log_size));
|
|
|
|
mysql_bin_log.set_max_size(max_binlog_size);
|
2003-08-19 15:00:12 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
2003-07-06 17:59:54 +02:00
|
|
|
if (!max_relay_log_size)
|
|
|
|
active_mi->rli.relay_log.set_max_size(max_binlog_size);
|
2003-08-18 23:08:08 +02:00
|
|
|
#endif
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2003-10-06 14:11:16 +02:00
|
|
|
static void fix_max_relay_log_size(THD *thd, enum_var_type type)
|
2003-07-06 17:59:54 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("fix_max_relay_log_size");
|
|
|
|
DBUG_PRINT("info",("max_binlog_size=%lu max_relay_log_size=%lu",
|
|
|
|
max_binlog_size, max_relay_log_size));
|
2003-08-19 15:00:12 +02:00
|
|
|
#ifdef HAVE_REPLICATION
|
2003-07-06 17:59:54 +02:00
|
|
|
active_mi->rli.relay_log.set_max_size(max_relay_log_size ?
|
|
|
|
max_relay_log_size: max_binlog_size);
|
2003-08-19 15:00:12 +02:00
|
|
|
#endif
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2002-08-13 01:18:39 +02:00
|
|
|
|
2003-10-16 06:44:18 +02:00
|
|
|
|
2004-04-09 18:50:28 +02:00
|
|
|
static int check_max_delayed_threads(THD *thd, set_var *var)
|
|
|
|
{
|
2004-04-27 14:33:40 +02:00
|
|
|
longlong val= var->value->val_int();
|
2004-04-09 18:50:28 +02:00
|
|
|
if (var->type != OPT_GLOBAL && val != 0 &&
|
2004-04-27 14:33:40 +02:00
|
|
|
val != (longlong) global_system_variables.max_insert_delayed_threads)
|
2004-04-09 18:50:28 +02:00
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), var->var->name, llstr(val, buf));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-27 14:33:40 +02:00
|
|
|
|
2003-10-16 06:44:18 +02:00
|
|
|
static void fix_max_connections(THD *thd, enum_var_type type)
|
2003-10-06 14:11:16 +02:00
|
|
|
{
|
2004-07-22 21:00:50 +02:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2004-03-04 18:58:36 +01:00
|
|
|
resize_thr_alarm(max_connections +
|
|
|
|
global_system_variables.max_insert_delayed_threads + 10);
|
2004-07-22 21:00:50 +02:00
|
|
|
#endif
|
2003-10-06 14:11:16 +02:00
|
|
|
}
|
|
|
|
|
2003-10-16 06:44:18 +02:00
|
|
|
|
2004-02-02 21:01:58 +01:00
|
|
|
static void fix_thd_mem_root(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
reset_root_defaults(&thd->mem_root,
|
|
|
|
thd->variables.query_alloc_block_size,
|
|
|
|
thd->variables.query_prealloc_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void fix_trans_mem_root(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type != OPT_GLOBAL)
|
|
|
|
reset_root_defaults(&thd->transaction.mem_root,
|
|
|
|
thd->variables.trans_alloc_block_size,
|
|
|
|
thd->variables.trans_prealloc_size);
|
|
|
|
}
|
|
|
|
|
2004-05-19 23:54:52 +02:00
|
|
|
|
2004-05-19 15:03:32 +02:00
|
|
|
static void fix_server_id(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
server_id_supplied = 1;
|
|
|
|
}
|
2004-02-02 21:01:58 +01:00
|
|
|
|
2004-05-19 23:54:52 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_long_ptr::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2002-07-23 17:31:22 +02:00
|
|
|
if (option_limits)
|
|
|
|
*value= (ulong) getopt_ull_limit_value(tmp, option_limits);
|
|
|
|
else
|
|
|
|
*value= (ulong) tmp;
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_long_ptr::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
*value= (ulong) option_limits->def_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-12-05 15:38:49 +01:00
|
|
|
bool sys_var_ulonglong_ptr::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2002-12-05 15:38:49 +01:00
|
|
|
if (option_limits)
|
|
|
|
*value= (ulonglong) getopt_ull_limit_value(tmp, option_limits);
|
|
|
|
else
|
|
|
|
*value= (ulonglong) tmp;
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
2002-12-05 15:38:49 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_ulonglong_ptr::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2002-12-05 15:38:49 +01:00
|
|
|
*value= (ulonglong) option_limits->def_value;
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
2002-12-05 15:38:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_bool_ptr::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
*value= (my_bool) var->save_result.ulong_value;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_bool_ptr::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
*value= (my_bool) option_limits->def_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-13 01:18:39 +02:00
|
|
|
bool sys_var_enum::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
*value= (uint) var->save_result.ulong_value;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_enum::value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
|
2002-08-13 01:18:39 +02:00
|
|
|
{
|
|
|
|
return (byte*) enum_names->type_names[*value];
|
|
|
|
}
|
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
bool sys_var_thd_ulong::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
return (sys_var_thd::check(thd, var) ||
|
|
|
|
(check_func && (*check_func)(thd, var)));
|
|
|
|
}
|
2002-08-13 01:18:39 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_thd_ulong::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
/* Don't use bigger value than given with --maximum-variable-name=.. */
|
|
|
|
if ((ulong) tmp > max_system_variables.*offset)
|
|
|
|
tmp= max_system_variables.*offset;
|
|
|
|
|
|
|
|
if (option_limits)
|
|
|
|
tmp= (ulong) getopt_ull_limit_value(tmp, option_limits);
|
|
|
|
if (var->type == OPT_GLOBAL)
|
2002-08-12 02:33:46 +02:00
|
|
|
global_system_variables.*offset= (ulong) tmp;
|
2002-07-23 17:31:22 +02:00
|
|
|
else
|
|
|
|
thd->variables.*offset= (ulong) tmp;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_ulong::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
/* We will not come here if option_limits is not set */
|
|
|
|
global_system_variables.*offset= (ulong) option_limits->def_value;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_ulong::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return (byte*) &(global_system_variables.*offset);
|
|
|
|
return (byte*) &(thd->variables.*offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-12-20 13:58:27 +01:00
|
|
|
bool sys_var_thd_ha_rows::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2002-12-20 13:58:27 +01:00
|
|
|
|
|
|
|
/* Don't use bigger value than given with --maximum-variable-name=.. */
|
|
|
|
if ((ha_rows) tmp > max_system_variables.*offset)
|
|
|
|
tmp= max_system_variables.*offset;
|
|
|
|
|
|
|
|
if (option_limits)
|
|
|
|
tmp= (ha_rows) getopt_ull_limit_value(tmp, option_limits);
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
/* Lock is needed to make things safe on 32 bit systems */
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
global_system_variables.*offset= (ha_rows) tmp;
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.*offset= (ha_rows) tmp;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_ha_rows::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
/* We will not come here if option_limits is not set */
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
global_system_variables.*offset= (ha_rows) option_limits->def_value;
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_ha_rows::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-12-20 13:58:27 +01:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return (byte*) &(global_system_variables.*offset);
|
|
|
|
return (byte*) &(thd->variables.*offset);
|
|
|
|
}
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_thd_ulonglong::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2003-05-13 18:34:51 +02:00
|
|
|
|
2004-05-19 14:42:29 +02:00
|
|
|
if (tmp > max_system_variables.*offset)
|
2003-05-13 18:34:51 +02:00
|
|
|
tmp= max_system_variables.*offset;
|
|
|
|
|
|
|
|
if (option_limits)
|
2004-05-19 14:42:29 +02:00
|
|
|
tmp= getopt_ull_limit_value(tmp, option_limits);
|
2002-07-23 17:31:22 +02:00
|
|
|
if (var->type == OPT_GLOBAL)
|
2002-12-20 13:58:27 +01:00
|
|
|
{
|
|
|
|
/* Lock is needed to make things safe on 32 bit systems */
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2003-05-13 18:34:51 +02:00
|
|
|
global_system_variables.*offset= (ulonglong) tmp;
|
2002-12-20 13:58:27 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
}
|
2002-07-23 17:31:22 +02:00
|
|
|
else
|
2003-05-13 18:34:51 +02:00
|
|
|
thd->variables.*offset= (ulonglong) tmp;
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_ulonglong::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2002-12-20 13:58:27 +01:00
|
|
|
{
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2002-11-11 16:28:58 +01:00
|
|
|
global_system_variables.*offset= (ulonglong) option_limits->def_value;
|
2002-12-20 13:58:27 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
}
|
2002-07-23 17:31:22 +02:00
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_ulonglong::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return (byte*) &(global_system_variables.*offset);
|
|
|
|
return (byte*) &(thd->variables.*offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_thd_bool::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= (my_bool) var->save_result.ulong_value;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= (my_bool) var->save_result.ulong_value;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_bool::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= (my_bool) option_limits->def_value;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_bool::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return (byte*) &(global_system_variables.*offset);
|
|
|
|
return (byte*) &(thd->variables.*offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var::check_enum(THD *thd, set_var *var, TYPELIB *enum_names)
|
|
|
|
{
|
2003-10-14 15:30:42 +02:00
|
|
|
char buff[80];
|
|
|
|
const char *value;
|
2002-10-02 12:33:08 +02:00
|
|
|
String str(buff, sizeof(buff), system_charset_info), *res;
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
if (var->value->result_type() == STRING_RESULT)
|
|
|
|
{
|
|
|
|
if (!(res=var->value->val_str(&str)) ||
|
|
|
|
((long) (var->save_result.ulong_value=
|
2003-11-03 13:01:59 +01:00
|
|
|
(ulong) find_type(enum_names, res->ptr(),
|
|
|
|
res->length(),1)-1)) < 0)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2003-10-14 15:30:42 +02:00
|
|
|
value= res ? res->c_ptr() : "NULL";
|
2002-07-23 17:31:22 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ulonglong tmp=var->value->val_int();
|
|
|
|
if (tmp >= enum_names->count)
|
|
|
|
{
|
|
|
|
llstr(tmp,buff);
|
|
|
|
value=buff; // Wrong value is here
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
var->save_result.ulong_value= (ulong) tmp; // Save for update
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, value);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2003-01-16 01:04:50 +01:00
|
|
|
|
|
|
|
bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names)
|
|
|
|
{
|
2003-04-30 09:02:28 +02:00
|
|
|
bool not_used;
|
2003-01-21 20:07:59 +01:00
|
|
|
char buff[80], *error= 0;
|
2003-01-16 01:04:50 +01:00
|
|
|
uint error_len= 0;
|
|
|
|
String str(buff, sizeof(buff), system_charset_info), *res;
|
|
|
|
|
|
|
|
if (var->value->result_type() == STRING_RESULT)
|
|
|
|
{
|
|
|
|
if (!(res= var->value->val_str(&str)))
|
|
|
|
goto err;
|
2003-08-18 23:08:08 +02:00
|
|
|
var->save_result.ulong_value= ((ulong)
|
|
|
|
find_set(enum_names, res->c_ptr(),
|
|
|
|
res->length(), &error, &error_len,
|
|
|
|
¬_used));
|
2003-01-16 01:04:50 +01:00
|
|
|
if (error_len)
|
|
|
|
{
|
|
|
|
strmake(buff, error, min(sizeof(buff), error_len));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ulonglong tmp= var->value->val_int();
|
|
|
|
if (tmp >= enum_names->count)
|
|
|
|
{
|
|
|
|
llstr(tmp, buff);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
var->save_result.ulong_value= (ulong) tmp; // Save for update
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, buff);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
Return an Item for a variable. Used with @@[global.]variable_name
|
|
|
|
|
|
|
|
If type is not given, return local value if exists, else global
|
|
|
|
|
|
|
|
We have to use netprintf() instead of my_error() here as this is
|
|
|
|
called on the parsing stage.
|
2002-10-02 12:33:08 +02:00
|
|
|
|
|
|
|
TODO:
|
|
|
|
With prepared statements/stored procedures this has to be fixed
|
|
|
|
to create an item that gets the current value at fix_fields() stage.
|
2002-07-23 17:31:22 +02:00
|
|
|
*/
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (check_type(var_type))
|
|
|
|
{
|
|
|
|
if (var_type != OPT_DEFAULT)
|
|
|
|
{
|
2004-02-11 00:06:46 +01:00
|
|
|
net_printf(thd, ER_INCORRECT_GLOBAL_LOCAL_VAR,
|
2004-03-07 15:32:00 +01:00
|
|
|
name, var_type == OPT_GLOBAL ? "SESSION" : "GLOBAL");
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* As there was no local variable, return the global value */
|
|
|
|
var_type= OPT_GLOBAL;
|
|
|
|
}
|
|
|
|
switch (type()) {
|
|
|
|
case SHOW_LONG:
|
2003-11-18 12:47:27 +01:00
|
|
|
{
|
|
|
|
ulong value;
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
value= *(ulong*) value_ptr(thd, var_type, base);
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return new Item_uint((int32) value);
|
|
|
|
}
|
2002-07-23 17:31:22 +02:00
|
|
|
case SHOW_LONGLONG:
|
2003-08-17 13:10:15 +02:00
|
|
|
{
|
|
|
|
longlong value;
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2003-08-29 12:44:35 +02:00
|
|
|
value= *(longlong*) value_ptr(thd, var_type, base);
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return new Item_int(value);
|
|
|
|
}
|
2002-12-20 13:58:27 +01:00
|
|
|
case SHOW_HA_ROWS:
|
2003-08-17 13:10:15 +02:00
|
|
|
{
|
|
|
|
ha_rows value;
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2003-08-29 12:44:35 +02:00
|
|
|
value= *(ha_rows*) value_ptr(thd, var_type, base);
|
2003-08-17 13:10:15 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return new Item_int((longlong) value);
|
|
|
|
}
|
2002-07-23 17:31:22 +02:00
|
|
|
case SHOW_MY_BOOL:
|
2003-07-06 18:09:57 +02:00
|
|
|
return new Item_int((int32) *(my_bool*) value_ptr(thd, var_type, base),1);
|
2002-07-23 17:31:22 +02:00
|
|
|
case SHOW_CHAR:
|
|
|
|
{
|
2003-11-03 13:01:59 +01:00
|
|
|
Item_string *tmp;
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2003-07-06 18:09:57 +02:00
|
|
|
char *str= (char*) value_ptr(thd, var_type, base);
|
2003-11-03 13:01:59 +01:00
|
|
|
tmp= new Item_string(str, strlen(str), system_charset_info);
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return tmp;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
default:
|
2002-10-02 12:33:08 +02:00
|
|
|
net_printf(thd, ER_VAR_CANT_BE_READ, name);
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_thd_enum::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= var->save_result.ulong_value;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= var->save_result.ulong_value;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_enum::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= (ulong) option_limits->def_value;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_enum::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
ulong tmp= ((type == OPT_GLOBAL) ?
|
|
|
|
global_system_variables.*offset :
|
|
|
|
thd->variables.*offset);
|
|
|
|
return (byte*) enum_names->type_names[tmp];
|
|
|
|
}
|
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
bool sys_var_thd_bit::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
return (check_enum(thd, var, &bool_typelib) ||
|
|
|
|
(check_func && (*check_func)(thd, var)));
|
|
|
|
}
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
bool sys_var_thd_bit::update(THD *thd, set_var *var)
|
|
|
|
{
|
2002-09-22 17:02:39 +02:00
|
|
|
int res= (*update_func)(thd, var);
|
2002-07-23 17:31:22 +02:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_bit::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
If reverse is 0 (default) return 1 if bit is set.
|
|
|
|
If reverse is 1, return 0 if bit is set
|
|
|
|
*/
|
|
|
|
thd->sys_var_tmp.my_bool_value= ((thd->options & bit_flag) ?
|
|
|
|
!reverse : reverse);
|
|
|
|
return (byte*) &thd->sys_var_tmp.my_bool_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-03 13:01:59 +01:00
|
|
|
/* Update a date_time format variable based on given value */
|
|
|
|
|
|
|
|
void sys_var_thd_date_time_format::update2(THD *thd, enum_var_type type,
|
|
|
|
DATE_TIME_FORMAT *new_value)
|
|
|
|
{
|
|
|
|
DATE_TIME_FORMAT *old;
|
|
|
|
DBUG_ENTER("sys_var_date_time_format::update2");
|
|
|
|
DBUG_DUMP("positions",(char*) new_value->positions,
|
|
|
|
sizeof(new_value->positions));
|
|
|
|
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
old= (global_system_variables.*offset);
|
|
|
|
(global_system_variables.*offset)= new_value;
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
old= (thd->variables.*offset);
|
|
|
|
(thd->variables.*offset)= new_value;
|
|
|
|
}
|
|
|
|
my_free((char*) old, MYF(MY_ALLOW_ZERO_PTR));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_thd_date_time_format::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
DATE_TIME_FORMAT *new_value;
|
|
|
|
/* We must make a copy of the last value to get it into normal memory */
|
|
|
|
new_value= date_time_format_copy((THD*) 0,
|
|
|
|
var->save_result.date_time_format);
|
|
|
|
if (!new_value)
|
|
|
|
return 1; // Out of memory
|
|
|
|
update2(thd, var->type, new_value); // Can't fail
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_thd_date_time_format::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
char buff[80];
|
|
|
|
String str(buff,sizeof(buff), system_charset_info), *res;
|
|
|
|
DATE_TIME_FORMAT *format;
|
|
|
|
|
|
|
|
if (!(res=var->value->val_str(&str)))
|
|
|
|
res= &my_empty_string;
|
|
|
|
|
|
|
|
if (!(format= date_time_format_make(date_time_type,
|
|
|
|
res->ptr(), res->length())))
|
|
|
|
{
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, res->c_ptr());
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
We must copy result to thread space to not get a memory leak if
|
|
|
|
update is aborted
|
|
|
|
*/
|
|
|
|
var->save_result.date_time_format= date_time_format_copy(thd, format);
|
|
|
|
my_free((char*) format, MYF(0));
|
|
|
|
return var->save_result.date_time_format == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_date_time_format::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
DATE_TIME_FORMAT *res= 0;
|
|
|
|
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
const char *format;
|
|
|
|
if ((format= opt_date_time_formats[date_time_type]))
|
|
|
|
res= date_time_format_make(date_time_type, format, strlen(format));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Make copy with malloc */
|
|
|
|
res= date_time_format_copy((THD *) 0, global_system_variables.*offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (res) // Should always be true
|
|
|
|
update2(thd, type, res);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
byte *sys_var_thd_date_time_format::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
char *res;
|
|
|
|
/*
|
|
|
|
We do a copy here just to be sure things will work even if someone
|
|
|
|
is modifying the original string while the copy is accessed
|
|
|
|
(Can't happen now in SQL SHOW, but this is a good safety for the future)
|
|
|
|
*/
|
|
|
|
res= thd->strmake((global_system_variables.*offset)->format.str,
|
|
|
|
(global_system_variables.*offset)->format.length);
|
|
|
|
return (byte*) res;
|
|
|
|
}
|
|
|
|
return (byte*) (thd->variables.*offset)->format.str;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-04-07 13:10:27 +02:00
|
|
|
typedef struct old_names_map_st
|
|
|
|
{
|
2003-03-18 14:01:32 +01:00
|
|
|
const char *old_name;
|
|
|
|
const char *new_name;
|
|
|
|
} my_old_conv;
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2003-03-18 14:01:32 +01:00
|
|
|
static my_old_conv old_conv[]=
|
|
|
|
{
|
2003-11-03 13:01:59 +01:00
|
|
|
{ "cp1251_koi8" , "cp1251" },
|
|
|
|
{ "cp1250_latin2" , "cp1250" },
|
|
|
|
{ "kam_latin2" , "keybcs2" },
|
|
|
|
{ "mac_latin2" , "MacRoman" },
|
|
|
|
{ "macce_latin2" , "MacCE" },
|
|
|
|
{ "pc2_latin2" , "pclatin2" },
|
|
|
|
{ "vga_latin2" , "pclatin1" },
|
|
|
|
{ "koi8_cp1251" , "koi8r" },
|
|
|
|
{ "win1251ukr_koi8_ukr" , "win1251ukr" },
|
|
|
|
{ "koi8_ukr_win1251ukr" , "koi8u" },
|
|
|
|
{ NULL , NULL }
|
2003-03-18 14:01:32 +01:00
|
|
|
};
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2003-04-05 15:56:15 +02:00
|
|
|
CHARSET_INFO *get_old_charset_by_name(const char *name)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2003-08-18 23:08:08 +02:00
|
|
|
my_old_conv *conv;
|
2003-03-18 14:01:32 +01:00
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
for (conv= old_conv; conv->old_name; conv++)
|
2002-12-14 16:43:01 +01:00
|
|
|
{
|
2003-08-18 23:08:08 +02:00
|
|
|
if (!my_strcasecmp(&my_charset_latin1, name, conv->old_name))
|
|
|
|
return get_charset_by_csname(conv->new_name, MY_CS_PRIMARY, MYF(0));
|
2002-12-14 16:43:01 +01:00
|
|
|
}
|
2003-03-18 14:01:32 +01:00
|
|
|
return NULL;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
|
2003-04-07 13:10:27 +02:00
|
|
|
bool sys_var_collation::check(THD *thd, set_var *var)
|
2003-02-26 13:37:41 +01:00
|
|
|
{
|
|
|
|
CHARSET_INFO *tmp;
|
|
|
|
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
if (var->value->result_type() == STRING_RESULT)
|
2004-03-29 15:33:24 +02:00
|
|
|
{
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
char buff[80];
|
|
|
|
String str(buff,sizeof(buff), system_charset_info), *res;
|
|
|
|
if (!(res=var->value->val_str(&str)))
|
|
|
|
{
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, "NULL");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (!(tmp=get_charset_by_name(res->c_ptr(),MYF(0))))
|
|
|
|
{
|
|
|
|
my_error(ER_UNKNOWN_COLLATION, MYF(0), res->c_ptr());
|
|
|
|
return 1;
|
|
|
|
}
|
2004-03-29 15:33:24 +02:00
|
|
|
}
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
else // INT_RESULT
|
2003-05-21 14:44:12 +02:00
|
|
|
{
|
2004-07-08 14:45:25 +02:00
|
|
|
if (!(tmp=get_charset((int) var->value->val_int(),MYF(0))))
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
{
|
|
|
|
char buf[20];
|
2004-07-08 14:45:25 +02:00
|
|
|
int10_to_str((int) var->value->val_int(), buf, -10);
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
my_error(ER_UNKNOWN_COLLATION, MYF(0), buf);
|
|
|
|
return 1;
|
|
|
|
}
|
2003-05-21 14:44:12 +02:00
|
|
|
}
|
|
|
|
var->save_result.charset= tmp; // Save for update
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-21 14:44:12 +02:00
|
|
|
bool sys_var_character_set::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
CHARSET_INFO *tmp;
|
|
|
|
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
if (var->value->result_type() == STRING_RESULT)
|
|
|
|
{
|
|
|
|
char buff[80];
|
|
|
|
String str(buff,sizeof(buff), system_charset_info), *res;
|
|
|
|
if (!(res=var->value->val_str(&str)))
|
2003-05-30 10:56:02 +02:00
|
|
|
{
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
if (!nullable)
|
|
|
|
{
|
|
|
|
my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), name, "NULL");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
tmp= NULL;
|
|
|
|
}
|
|
|
|
else if (!(tmp=get_charset_by_csname(res->c_ptr(),MY_CS_PRIMARY,MYF(0))) &&
|
|
|
|
!(tmp=get_old_charset_by_name(res->c_ptr())))
|
|
|
|
{
|
|
|
|
my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), res->c_ptr());
|
2003-05-30 10:56:02 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
else // INT_RESULT
|
2003-02-26 13:37:41 +01:00
|
|
|
{
|
2004-07-08 14:45:25 +02:00
|
|
|
if (!(tmp=get_charset((int) var->value->val_int(),MYF(0))))
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
{
|
|
|
|
char buf[20];
|
2004-07-08 14:45:25 +02:00
|
|
|
int10_to_str((int) var->value->val_int(), buf, -10);
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), buf);
|
|
|
|
return 1;
|
|
|
|
}
|
2003-02-26 13:37:41 +01:00
|
|
|
}
|
|
|
|
var->save_result.charset= tmp; // Save for update
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
bool sys_var_character_set::update(THD *thd, set_var *var)
|
2003-02-26 13:37:41 +01:00
|
|
|
{
|
2003-05-30 10:03:56 +02:00
|
|
|
ci_ptr(thd,var->type)[0]= var->save_result.charset;
|
2003-09-16 14:14:23 +02:00
|
|
|
thd->update_charset();
|
2003-02-26 13:37:41 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
|
|
|
byte *sys_var_character_set::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2003-02-26 13:37:41 +01:00
|
|
|
{
|
2003-05-30 10:03:56 +02:00
|
|
|
CHARSET_INFO *cs= ci_ptr(thd,type)[0];
|
2003-05-21 14:44:12 +02:00
|
|
|
return cs ? (byte*) cs->csname : (byte*) "NULL";
|
2003-02-26 13:37:41 +01:00
|
|
|
}
|
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
CHARSET_INFO ** sys_var_character_set_connection::ci_ptr(THD *thd,
|
|
|
|
enum_var_type type)
|
2003-05-30 10:24:24 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return &global_system_variables.collation_connection;
|
|
|
|
else
|
|
|
|
return &thd->variables.collation_connection;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
|
|
|
void sys_var_character_set_connection::set_default(THD *thd,
|
|
|
|
enum_var_type type)
|
2003-05-30 10:24:24 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.collation_connection= default_charset_info;
|
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
2003-05-30 10:24:24 +02:00
|
|
|
thd->variables.collation_connection= global_system_variables.collation_connection;
|
2003-08-18 23:08:08 +02:00
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-05-30 10:24:24 +02:00
|
|
|
}
|
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
CHARSET_INFO ** sys_var_character_set_client::ci_ptr(THD *thd,
|
|
|
|
enum_var_type type)
|
2003-05-30 10:03:56 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return &global_system_variables.character_set_client;
|
|
|
|
else
|
|
|
|
return &thd->variables.character_set_client;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-21 14:44:12 +02:00
|
|
|
void sys_var_character_set_client::set_default(THD *thd, enum_var_type type)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-05-21 14:44:12 +02:00
|
|
|
global_system_variables.character_set_client= default_charset_info;
|
2003-04-07 13:10:27 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
|
|
|
thd->variables.character_set_client= (global_system_variables.
|
|
|
|
character_set_client);
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-04-07 13:10:27 +02:00
|
|
|
}
|
2003-02-26 13:37:41 +01:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
CHARSET_INFO **
|
|
|
|
sys_var_character_set_results::ci_ptr(THD *thd, enum_var_type type)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
2003-05-30 10:03:56 +02:00
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return &global_system_variables.character_set_results;
|
2003-04-07 13:10:27 +02:00
|
|
|
else
|
2003-05-30 10:03:56 +02:00
|
|
|
return &thd->variables.character_set_results;
|
2003-04-07 13:10:27 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
void sys_var_character_set_results::set_default(THD *thd, enum_var_type type)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
2003-05-30 10:03:56 +02:00
|
|
|
if (type == OPT_GLOBAL)
|
2003-05-30 20:09:35 +02:00
|
|
|
global_system_variables.character_set_results= default_charset_info;
|
2003-05-30 10:03:56 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
|
|
|
thd->variables.character_set_results= (global_system_variables.
|
|
|
|
character_set_results);
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-04-07 13:10:27 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
CHARSET_INFO **
|
|
|
|
sys_var_character_set_server::ci_ptr(THD *thd, enum_var_type type)
|
2003-05-30 10:03:56 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-09-15 13:31:04 +02:00
|
|
|
return &global_system_variables.collation_server;
|
2003-05-30 10:03:56 +02:00
|
|
|
else
|
2003-09-15 13:31:04 +02:00
|
|
|
return &thd->variables.collation_server;
|
2003-05-30 10:03:56 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
void sys_var_character_set_server::set_default(THD *thd, enum_var_type type)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-09-15 13:31:04 +02:00
|
|
|
global_system_variables.collation_server= default_charset_info;
|
2003-04-07 13:10:27 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
2003-09-15 13:31:04 +02:00
|
|
|
thd->variables.collation_server= global_system_variables.collation_server;
|
2003-08-18 23:08:08 +02:00
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-05-30 10:03:56 +02:00
|
|
|
}
|
|
|
|
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000)
|
|
|
|
bool sys_var_character_set_server::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if ((var->type == OPT_GLOBAL) &&
|
|
|
|
(mysql_bin_log.is_open() ||
|
|
|
|
active_mi->slave_running || active_mi->rli.slave_running))
|
|
|
|
{
|
|
|
|
my_printf_error(0, "Binary logging and replication forbid changing \
|
|
|
|
the global server character set or collation", MYF(0));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return sys_var_character_set::check(thd,var);
|
|
|
|
}
|
|
|
|
#endif
|
2003-07-06 18:09:57 +02:00
|
|
|
|
|
|
|
CHARSET_INFO ** sys_var_character_set_database::ci_ptr(THD *thd,
|
|
|
|
enum_var_type type)
|
2003-05-30 10:03:56 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-09-15 13:31:04 +02:00
|
|
|
return &global_system_variables.collation_database;
|
2003-05-30 10:03:56 +02:00
|
|
|
else
|
2003-09-15 13:31:04 +02:00
|
|
|
return &thd->variables.collation_database;
|
2003-04-07 13:10:27 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
void sys_var_character_set_database::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-09-15 13:31:04 +02:00
|
|
|
global_system_variables.collation_database= default_charset_info;
|
2003-05-30 10:03:56 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
2003-09-15 13:31:04 +02:00
|
|
|
thd->variables.collation_database= thd->db_charset;
|
2003-08-18 23:08:08 +02:00
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-05-30 10:03:56 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
bool sys_var_collation_connection::update(THD *thd, set_var *var)
|
2003-04-08 11:38:17 +02:00
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
2003-05-30 10:03:56 +02:00
|
|
|
global_system_variables.collation_connection= var->save_result.charset;
|
2003-04-08 11:38:17 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
2003-05-30 10:03:56 +02:00
|
|
|
thd->variables.collation_connection= var->save_result.charset;
|
2003-08-18 23:08:08 +02:00
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-04-08 11:38:17 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
|
|
|
byte *sys_var_collation_connection::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2003-04-08 11:38:17 +02:00
|
|
|
{
|
|
|
|
CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
|
2003-05-30 10:03:56 +02:00
|
|
|
global_system_variables.collation_connection :
|
|
|
|
thd->variables.collation_connection);
|
|
|
|
return cs ? (byte*) cs->name : (byte*) "NULL";
|
2003-04-08 11:38:17 +02:00
|
|
|
}
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
void sys_var_collation_connection::set_default(THD *thd, enum_var_type type)
|
2003-04-08 11:38:17 +02:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
2003-05-30 10:03:56 +02:00
|
|
|
global_system_variables.collation_connection= default_charset_info;
|
2003-04-08 11:38:17 +02:00
|
|
|
else
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
|
|
|
thd->variables.collation_connection= (global_system_variables.
|
|
|
|
collation_connection);
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
2003-04-08 11:38:17 +02:00
|
|
|
}
|
|
|
|
|
2003-09-15 13:31:04 +02:00
|
|
|
bool sys_var_collation_database::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
global_system_variables.collation_database= var->save_result.charset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
thd->variables.collation_database= var->save_result.charset;
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
byte *sys_var_collation_database::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
|
|
|
{
|
|
|
|
CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
|
|
|
|
global_system_variables.collation_database :
|
|
|
|
thd->variables.collation_database);
|
|
|
|
return cs ? (byte*) cs->name : (byte*) "NULL";
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_collation_database::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.collation_database= default_charset_info;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
thd->variables.collation_database= (global_system_variables.
|
|
|
|
collation_database);
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000)
|
|
|
|
bool sys_var_collation_server::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if ((var->type == OPT_GLOBAL) &&
|
|
|
|
(mysql_bin_log.is_open() ||
|
|
|
|
active_mi->slave_running || active_mi->rli.slave_running))
|
|
|
|
{
|
|
|
|
my_printf_error(0, "Binary logging and replication forbid changing \
|
|
|
|
the global server character set or collation", MYF(0));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return sys_var_collation::check(thd,var);
|
|
|
|
}
|
|
|
|
#endif
|
2003-09-15 13:31:04 +02:00
|
|
|
|
|
|
|
bool sys_var_collation_server::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
global_system_variables.collation_server= var->save_result.charset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
thd->variables.collation_server= var->save_result.charset;
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
byte *sys_var_collation_server::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
|
|
|
{
|
|
|
|
CHARSET_INFO *cs= ((type == OPT_GLOBAL) ?
|
|
|
|
global_system_variables.collation_server :
|
|
|
|
thd->variables.collation_server);
|
|
|
|
return cs ? (byte*) cs->name : (byte*) "NULL";
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_collation_server::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.collation_server= default_charset_info;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
thd->variables.collation_server= (global_system_variables.
|
|
|
|
collation_server);
|
|
|
|
thd->update_charset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-04-07 13:10:27 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
LEX_STRING default_key_cache_base= {(char *) "default", 7 };
|
2003-08-02 11:43:18 +02:00
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
static KEY_CACHE zero_key_cache;
|
2003-08-02 11:43:18 +02:00
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *get_key_cache(LEX_STRING *cache_name)
|
2003-08-02 11:43:18 +02:00
|
|
|
{
|
2003-11-18 12:47:27 +01:00
|
|
|
safe_mutex_assert_owner(&LOCK_global_system_variables);
|
|
|
|
if (!cache_name || ! cache_name->length)
|
2003-08-02 11:43:18 +02:00
|
|
|
cache_name= &default_key_cache_base;
|
2003-11-20 21:06:25 +01:00
|
|
|
return ((KEY_CACHE*) find_named(&key_caches,
|
2003-11-18 12:47:27 +01:00
|
|
|
cache_name->str, cache_name->length, 0));
|
2003-08-02 11:43:18 +02:00
|
|
|
}
|
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
|
2003-08-02 11:43:18 +02:00
|
|
|
byte *sys_var_key_cache_param::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache= get_key_cache(base);
|
2003-08-02 11:43:18 +02:00
|
|
|
if (!key_cache)
|
|
|
|
key_cache= &zero_key_cache;
|
|
|
|
return (byte*) key_cache + offset ;
|
|
|
|
}
|
2004-02-16 18:53:00 +01:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
bool sys_var_key_buffer_size::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
ulonglong tmp= var->save_result.ulonglong_value;
|
2003-08-18 23:08:08 +02:00
|
|
|
LEX_STRING *base_name= &var->base;
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache;
|
2003-11-18 12:47:27 +01:00
|
|
|
bool error= 0;
|
|
|
|
|
|
|
|
/* If no basename, assume it's for the key cache named 'default' */
|
2003-08-18 23:08:08 +02:00
|
|
|
if (!base_name->length)
|
2003-08-27 00:14:13 +02:00
|
|
|
base_name= &default_key_cache_base;
|
2003-11-18 12:47:27 +01:00
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
key_cache= get_key_cache(base_name);
|
2003-08-02 11:43:18 +02:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
if (!key_cache)
|
|
|
|
{
|
2003-11-18 12:47:27 +01:00
|
|
|
/* Key cache didn't exists */
|
2003-07-06 18:09:57 +02:00
|
|
|
if (!tmp) // Tried to delete cache
|
2003-11-18 12:47:27 +01:00
|
|
|
goto end; // Ok, nothing to do
|
|
|
|
if (!(key_cache= create_key_cache(base_name->str, base_name->length)))
|
|
|
|
{
|
|
|
|
error= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
2003-11-18 12:47:27 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Abort if some other thread is changing the key cache
|
|
|
|
TODO: This should be changed so that we wait until the previous
|
|
|
|
assignment is done and then do the new assign
|
|
|
|
*/
|
|
|
|
if (key_cache->in_init)
|
|
|
|
goto end;
|
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
if (!tmp) // Zero size means delete
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
2003-11-18 12:47:27 +01:00
|
|
|
if (key_cache == sql_key_cache)
|
|
|
|
goto end; // Ignore default key cache
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
if (key_cache->key_cache_inited) // If initied
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
|
|
|
/*
|
2003-11-18 12:47:27 +01:00
|
|
|
Move tables using this key cache to the default key cache
|
|
|
|
and clear the old key cache.
|
2003-07-06 18:09:57 +02:00
|
|
|
*/
|
2003-08-27 00:14:13 +02:00
|
|
|
NAMED_LIST *list;
|
2003-11-20 21:06:25 +01:00
|
|
|
key_cache= (KEY_CACHE *) find_named(&key_caches, base_name->str,
|
2003-08-27 00:14:13 +02:00
|
|
|
base_name->length, &list);
|
2003-11-18 12:47:27 +01:00
|
|
|
key_cache->in_init= 1;
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
error= reassign_keycache_tables(thd, key_cache, sql_key_cache);
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
key_cache->in_init= 0;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
2003-11-18 12:47:27 +01:00
|
|
|
/*
|
|
|
|
We don't delete the key cache as some running threads my still be
|
|
|
|
in the key cache code with a pointer to the deleted (empty) key cache
|
|
|
|
*/
|
|
|
|
goto end;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
key_cache->param_buff_size=
|
|
|
|
(ulonglong) getopt_ull_limit_value(tmp, option_limits);
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
/* If key cache didn't existed initialize it, else resize it */
|
|
|
|
key_cache->in_init= 1;
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
if (!key_cache->key_cache_inited)
|
2003-11-18 12:47:27 +01:00
|
|
|
error= (bool) (ha_init_key_cache("", key_cache));
|
2003-08-02 11:43:18 +02:00
|
|
|
else
|
2003-11-18 12:47:27 +01:00
|
|
|
error= (bool)(ha_resize_key_cache(key_cache));
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
key_cache->in_init= 0;
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
end:
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return error;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
|
|
|
|
bool sys_var_key_cache_long::update(THD *thd, set_var *var)
|
2003-08-09 20:12:22 +02:00
|
|
|
{
|
2003-11-21 00:53:01 +01:00
|
|
|
ulong tmp= (ulong) var->value->val_int();
|
2003-08-27 00:14:13 +02:00
|
|
|
LEX_STRING *base_name= &var->base;
|
2003-11-18 12:47:27 +01:00
|
|
|
bool error= 0;
|
|
|
|
|
2003-08-27 00:14:13 +02:00
|
|
|
if (!base_name->length)
|
2003-08-26 09:13:22 +02:00
|
|
|
base_name= &default_key_cache_base;
|
2003-11-18 12:47:27 +01:00
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache= get_key_cache(base_name);
|
2004-02-16 18:53:00 +01:00
|
|
|
|
2003-08-26 09:13:22 +02:00
|
|
|
if (!key_cache && !(key_cache= create_key_cache(base_name->str,
|
|
|
|
base_name->length)))
|
2003-11-18 12:47:27 +01:00
|
|
|
{
|
|
|
|
error= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
2004-02-16 18:53:00 +01:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
/*
|
|
|
|
Abort if some other thread is changing the key cache
|
|
|
|
TODO: This should be changed so that we wait until the previous
|
|
|
|
assignment is done and then do the new assign
|
|
|
|
*/
|
|
|
|
if (key_cache->in_init)
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
*((ulong*) (((char*) key_cache) + offset))=
|
2003-08-09 20:12:22 +02:00
|
|
|
(ulong) getopt_ull_limit_value(tmp, option_limits);
|
2003-08-18 23:08:08 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
/*
|
|
|
|
Don't create a new key cache if it didn't exist
|
|
|
|
(key_caches are created only when the user sets block_size)
|
|
|
|
*/
|
|
|
|
key_cache->in_init= 1;
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
2003-07-06 18:09:57 +02:00
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
error= (bool) (ha_resize_key_cache(key_cache));
|
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
key_cache->in_init= 0;
|
|
|
|
|
|
|
|
end:
|
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
|
|
|
return error;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
2003-05-30 10:03:56 +02:00
|
|
|
|
2003-04-07 13:10:27 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
Functions to handle SET NAMES and SET CHARACTER SET
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2003-04-23 15:19:22 +02:00
|
|
|
int set_var_collation_client::check(THD *thd)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-04-23 15:19:22 +02:00
|
|
|
int set_var_collation_client::update(THD *thd)
|
2003-04-07 13:10:27 +02:00
|
|
|
{
|
2003-05-21 14:44:12 +02:00
|
|
|
thd->variables.character_set_client= character_set_client;
|
|
|
|
thd->variables.character_set_results= character_set_results;
|
2003-04-23 15:19:22 +02:00
|
|
|
thd->variables.collation_connection= collation_connection;
|
2003-08-18 23:08:08 +02:00
|
|
|
thd->update_charset();
|
2003-04-07 13:10:27 +02:00
|
|
|
thd->protocol_simple.init(thd);
|
|
|
|
thd->protocol_prep.init(thd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_timestamp::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
thd->set_time((time_t) var->save_result.ulonglong_value);
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_timestamp::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
thd->user_time=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_timestamp::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
thd->sys_var_tmp.long_value= (long) thd->start_time;
|
|
|
|
return (byte*) &thd->sys_var_tmp.long_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_last_insert_id::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
thd->insert_id(var->save_result.ulonglong_value);
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_last_insert_id::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
thd->sys_var_tmp.long_value= (long) thd->insert_id();
|
|
|
|
return (byte*) &thd->last_insert_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_insert_id::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
thd->next_insert_id= var->save_result.ulonglong_value;
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_insert_id::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
return (byte*) &thd->current_insert_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-07-23 17:31:22 +02:00
|
|
|
bool sys_var_slave_skip_counter::check(THD *thd, set_var *var)
|
|
|
|
{
|
2002-09-22 17:02:39 +02:00
|
|
|
int result= 0;
|
2004-03-16 21:41:30 +01:00
|
|
|
pthread_mutex_lock(&LOCK_active_mi);
|
2002-07-23 17:31:22 +02:00
|
|
|
pthread_mutex_lock(&active_mi->rli.run_lock);
|
|
|
|
if (active_mi->rli.slave_running)
|
|
|
|
{
|
|
|
|
my_error(ER_SLAVE_MUST_STOP, MYF(0));
|
|
|
|
result=1;
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&active_mi->rli.run_lock);
|
2004-03-16 21:41:30 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_active_mi);
|
2003-10-24 16:28:32 +02:00
|
|
|
var->save_result.ulong_value= (ulong) var->value->val_int();
|
2002-07-23 17:31:22 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_slave_skip_counter::update(THD *thd, set_var *var)
|
|
|
|
{
|
2004-03-16 21:41:30 +01:00
|
|
|
pthread_mutex_lock(&LOCK_active_mi);
|
2002-07-23 17:31:22 +02:00
|
|
|
pthread_mutex_lock(&active_mi->rli.run_lock);
|
|
|
|
/*
|
|
|
|
The following test should normally never be true as we test this
|
|
|
|
in the check function; To be safe against multiple
|
|
|
|
SQL_SLAVE_SKIP_COUNTER request, we do the check anyway
|
|
|
|
*/
|
|
|
|
if (!active_mi->rli.slave_running)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&active_mi->rli.data_lock);
|
2003-10-24 16:28:32 +02:00
|
|
|
active_mi->rli.slave_skip_counter= var->save_result.ulong_value;
|
2002-07-23 17:31:22 +02:00
|
|
|
pthread_mutex_unlock(&active_mi->rli.data_lock);
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&active_mi->rli.run_lock);
|
2004-03-16 21:41:30 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_active_mi);
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
2004-06-10 15:56:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_sync_binlog_period::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
pthread_mutex_t *lock_log= mysql_bin_log.get_log_lock();
|
2004-08-16 17:00:48 +02:00
|
|
|
sync_binlog_period= (ulong) var->save_result.ulonglong_value;
|
2004-06-10 15:56:13 +02:00
|
|
|
/*
|
|
|
|
Must reset the counter otherwise it may already be beyond the new period
|
|
|
|
and so the new period will not be taken into account. Need mutex otherwise
|
|
|
|
might be cancelled by a simultanate ++ in MYSQL_LOG::write().
|
|
|
|
*/
|
|
|
|
pthread_mutex_lock(lock_log);
|
|
|
|
sync_binlog_counter= 0;
|
|
|
|
pthread_mutex_unlock(lock_log);
|
|
|
|
return 0;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2002-07-23 17:31:22 +02:00
|
|
|
|
2002-11-07 03:02:37 +01:00
|
|
|
bool sys_var_rand_seed1::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
thd->rand.seed1= (ulong) var->save_result.ulonglong_value;
|
2002-11-07 03:02:37 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sys_var_rand_seed2::update(THD *thd, set_var *var)
|
|
|
|
{
|
2003-10-24 16:28:32 +02:00
|
|
|
thd->rand.seed2= (ulong) var->save_result.ulonglong_value;
|
2002-11-07 03:02:37 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
bool sys_var_thd_time_zone::check(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
char buff[MAX_TIME_ZONE_NAME_LENGTH];
|
|
|
|
String str(buff, sizeof(buff), &my_charset_latin1);
|
|
|
|
String *res= var->value->val_str(&str);
|
|
|
|
|
|
|
|
#if defined(HAVE_REPLICATION) && (MYSQL_VERSION_ID < 50000)
|
|
|
|
if ((var->type == OPT_GLOBAL) &&
|
|
|
|
(mysql_bin_log.is_open() ||
|
|
|
|
active_mi->slave_running || active_mi->rli.slave_running))
|
|
|
|
{
|
|
|
|
my_printf_error(0, "Binary logging and replication forbid changing "
|
|
|
|
"of the global server time zone", MYF(0));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
2004-08-10 10:42:31 +02:00
|
|
|
|
|
|
|
if (!(var->save_result.time_zone=
|
|
|
|
my_tz_find(res, thd->lex->time_zone_tables_used)))
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
{
|
|
|
|
my_error(ER_UNKNOWN_TIME_ZONE, MYF(0), res ? res->c_ptr() : "NULL");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool sys_var_thd_time_zone::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
/* We are using Time_zone object found during check() phase */
|
|
|
|
*get_tz_ptr(thd,var->type)= var->save_result.time_zone;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
byte *sys_var_thd_time_zone::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We can use ptr() instead of c_ptr() here because String contaning
|
|
|
|
time zone name is guaranteed to be zero ended.
|
|
|
|
*/
|
|
|
|
return (byte *)((*get_tz_ptr(thd,type))->get_name()->ptr());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Time_zone** sys_var_thd_time_zone::get_tz_ptr(THD *thd,
|
|
|
|
enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
return &global_system_variables.time_zone;
|
|
|
|
else
|
|
|
|
return &thd->variables.time_zone;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_time_zone::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
{
|
|
|
|
if (default_tz_name)
|
|
|
|
{
|
|
|
|
String str(default_tz_name, &my_charset_latin1);
|
2004-08-10 10:42:31 +02:00
|
|
|
global_system_variables.time_zone=
|
|
|
|
my_tz_find(&str, thd->lex->time_zone_tables_used);
|
WL#1264 "Per-thread time zone support infrastructure".
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
include/my_global.h:
Added macro for reading of 32-bit ints stored in network order from
unaligned memory location.
include/mysqld_error.h:
Added error-code for invalid timestamp warning and error-code
for wrong or unknown time zone specification.
libmysqld/Makefile.am:
Added main per-thread time zone support file to libmysqld
libmysqld/lib_sql.cc:
Added initialization of time zones infrastructure to embedded server.
mysql-test/r/connect.result:
Updated test result since now mysql database contains more
system tables.
mysql-test/r/date_formats.result:
Now when truncation occurs during conversion to datetime value we are producing Warnings
instead of Notes. Also we are giving more clear warnings about this in some cases.
mysql-test/r/func_sapdb.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/func_time.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling.
mysql-test/r/select.result:
New warnings about truncation occured during conversion to datetime value added due
their better handling. Also tweaked test a bit to made it less ambigious for reader.
mysql-test/r/system_mysql_db.result:
Updated test result because new system tables holding time zone descriptions were
added.
mysql-test/r/timezone.result:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/r/type_datetime.result:
Separated and extended test of values and warnings produced for bad values stored in
DATETTIME fields.
mysql-test/r/type_time.result:
Now we are producing more consistent warning when we are truncating datetime value while
storing it in TIME field.
mysql-test/r/type_timestamp.result:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
mysql-test/t/select.test:
Updated test to make it less ambigous for reader.
mysql-test/t/timezone.test:
Updated timezone.test to use new system variable which shows system time zone.
Added test of warning which is produced if someone tries to store non-existing (due
falling into spring time-gap) datetime value into TIMESTAMP field.
mysql-test/t/type_datetime.test:
Separated and extended test of values and warnings produced for bad
values stored in DATETTIME fields.
mysql-test/t/type_timestamp.test:
Separated and extended test of values and warnings produced for bad
values stored in TIMESTAMP fields.
scripts/mysql_create_system_tables.sh:
Added creation of tables with time zone descriptions.
Also added descriptions of time zones used in tests.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.time_zone* tables family.
sql/Makefile.am:
Added files implementing time zone support to server, also added
rules for building of mysql_tzinfo_to_sql converter and test_time
test.
sql/field.cc:
Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
any other Field to datetime conversion (now we are generating warnings no in lower
level functions like in str_to_TIME() but in Field methods. This allows generate
better and more consistent warnings and to reuse code of str_to_TIME() outside of
server).
Added 3rd parameter to set_warning() method to be able to not increment cut fields
but still produce a warning. Also added set_datetime_warning() family of auxiliary
methods which allow easier generate datetime related warnings.
Also replaced occurences of current_thd with table->in_use member, added
asserts for catching all places there we need to set table->in_use
accordingly. Renamed fix_datetime() function to number_to_TIME() and
moved it to sql/time.cc there it fits better.
sql/field.h:
Added comment about places where we can use table->in_use member
instead of current_thd.
Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
family of methods.
sql/field_conv.cc:
Field::set_warning() method with 2 arguments was replaced with more
generic set_warning() method with 3 arguments.
sql/ha_berkeley.cc:
Now we set table->in_use for temporary tables so we have to use
table->tmp_table for checking if table is temporary.
sql/item.cc:
Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
generating analogs.
sql/item_create.cc:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_create.h:
Added creation of CONVERT_TZ function as FUNC_ARG3.
sql/item_timefunc.cc:
Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
UNIX_TIMESTAMP functions.
Added support for CONVERT_TZ function.
Removed call to str_to_timestamp function which caused non-optimal
behavior in certain cases. Replaced calls to str_to_time() function
with its warning generating analog.
sql/item_timefunc.h:
Added support of per-thread time zone to NOW-like and
FROM_UNIXTIME, UNIX_TIMESTAMP functions.
Added support of CONVERT_TZ function.
sql/lex.h:
Added support of CONVERT_TZ function.
sql/log.cc:
Added support for replication of statements depending on time zone.
sql/mysql_priv.h:
Now including headers with per-thread time zone support functions
and classes. Added portable replacement of time_t - my_time_t type.
Added time zone as one of query distinguishing parameters for
query cache.
Fixed declarations of str_to_TIME, str_to_time and
my_system_gmt_sec (former my_gmt_sec) since now they have one more
out parameter which informs about wrong datetime value or data
truncation during conversion.
Added warning generating version of str_to_TIME() and str_to_time()
functions.
Thrown away str_to_datetime/timestamp functions since they are not
needed any longer. Added number_to_TIME function.
sql/mysqld.cc:
Added per-thread time zone support initialization.
Added new startup parameter --default-time-zone.
sql/set_var.cc:
Added support for per-thread time_zone variable.
Renamed old timezone variable to system_time_zone.
sql/set_var.h:
Added support for per-thread time_zone variable.
sql/share/czech/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/danish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/dutch/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/english/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/estonian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/french/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/german/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/greek/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/hungarian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/italian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/japanese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/korean/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian-ny/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/norwegian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/polish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/portuguese/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/romanian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/russian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/serbian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/slovak/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/spanish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/swedish/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/share/ukrainian/errmsg.txt:
Added error message for barking when incorrect time zone name or
specifiaction is provided and for warning about invalid TIMESTAMP
values (e.g. falling into the spring time-gap).
sql/slave.cc:
In order to support replication of statements using time zones in 4.1 we should
ensure that both master and slave have same default time zone.
sql/sql_base.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_cache.cc:
Added time zone as one more query distinguishing parameter
for query cache.
sql/sql_class.cc:
Added THD::time_zone_used variable indicating that this query
uses per thread time zone.
sql/sql_class.h:
Added per-thread time zone variable. Added THD::time_zone_used
variable indicating that this query uses per thread time zone
so if this is updating query the time zone should be logged to
binlog.
sql/sql_insert.cc:
We should set TABLE::in_use member pointing to thread which is called
INSERT DELAYED and not to worker thread.
sql/sql_load.cc:
Field::set_warning() now has one more argument now.
sql/sql_parse.cc:
Resetting THD::time_zone_used variable in the end of query
processing.
sql/sql_select.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
sql/sql_show.cc:
Now using per thread time zone for extended show tables.
sql/time.cc:
Added support for per-thread time zones for TIMESTAMP type and
reworked generation of warnings for TIMESTAMP and DATETIME types.
(Introduced new TIME_to_timestamp() function. Removed hours
normalisation from former my_gmt_sec() since it was not working
and not used anywhere now, but breaks parameter constness, added
to this function generation of warning if we are falling in spring
time-gap. Removed str_to_timestamp and str_to_datetime functions
which are no longer used. Moved fix_datetime function from
sql/field.cc to this file as number_to_TIME() function. Added
out parameter for str_to_TIME and str_to_time functions which
indicates if value was truncated during conversion, removed direct
generation of warnings from this functions.)
sql/unireg.cc:
Now we are setting TABLE::in_use member for all tables (which assume
calls to Field::store or val_ methods).
BitKeeper/etc/ignore:
Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
2004-06-18 08:11:31 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
global_system_variables.time_zone= my_tz_SYSTEM;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
thd->variables.time_zone= global_system_variables.time_zone;
|
|
|
|
}
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*
|
|
|
|
Functions to update thd->options bits
|
|
|
|
*/
|
|
|
|
|
|
|
|
static bool set_option_bit(THD *thd, set_var *var)
|
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
sys_var_thd_bit *sys_var= ((sys_var_thd_bit*) var->var);
|
|
|
|
if ((var->save_result.ulong_value != 0) == sys_var->reverse)
|
|
|
|
thd->options&= ~sys_var->bit_flag;
|
2002-07-23 17:31:22 +02:00
|
|
|
else
|
2002-08-08 02:12:02 +02:00
|
|
|
thd->options|= sys_var->bit_flag;
|
2002-07-23 17:31:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool set_option_autocommit(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
/* The test is negative as the flag we use is NOT autocommit */
|
|
|
|
|
|
|
|
ulong org_options=thd->options;
|
|
|
|
|
|
|
|
if (var->save_result.ulong_value != 0)
|
|
|
|
thd->options&= ~((sys_var_thd_bit*) var->var)->bit_flag;
|
|
|
|
else
|
|
|
|
thd->options|= ((sys_var_thd_bit*) var->var)->bit_flag;
|
|
|
|
|
|
|
|
if ((org_options ^ thd->options) & OPTION_NOT_AUTOCOMMIT)
|
|
|
|
{
|
|
|
|
if ((org_options & OPTION_NOT_AUTOCOMMIT))
|
|
|
|
{
|
|
|
|
/* We changed to auto_commit mode */
|
|
|
|
thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_STATUS_NO_TRANS_UPDATE);
|
|
|
|
thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
|
|
|
|
if (ha_commit(thd))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
thd->options&= ~(ulong) (OPTION_STATUS_NO_TRANS_UPDATE);
|
|
|
|
thd->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
static int check_log_update(THD *thd, set_var *var)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2004-03-26 19:25:22 +01:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
if (!(thd->master_access & SUPER_ACL))
|
|
|
|
{
|
|
|
|
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
2004-03-27 01:07:09 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool set_log_update(THD *thd, set_var *var)
|
|
|
|
{
|
2002-07-23 17:31:22 +02:00
|
|
|
if (opt_sql_bin_update)
|
|
|
|
((sys_var_thd_bit*) var->var)->bit_flag|= (OPTION_BIN_LOG |
|
|
|
|
OPTION_UPDATE_LOG);
|
|
|
|
set_option_bit(thd, var);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-03-27 01:07:09 +01:00
|
|
|
static int check_pseudo_thread_id(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
var->save_result.ulonglong_value= var->value->val_int();
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
if (thd->master_access & SUPER_ACL)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
return 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2002-10-02 12:33:08 +02:00
|
|
|
static byte *get_warning_count(THD *thd)
|
|
|
|
{
|
|
|
|
thd->sys_var_tmp.long_value=
|
|
|
|
(thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_NOTE] +
|
|
|
|
thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_WARN]);
|
|
|
|
return (byte*) &thd->sys_var_tmp.long_value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static byte *get_error_count(THD *thd)
|
|
|
|
{
|
|
|
|
thd->sys_var_tmp.long_value=
|
|
|
|
thd->warn_count[(uint) MYSQL_ERROR::WARN_LEVEL_ERROR];
|
|
|
|
return (byte*) &thd->sys_var_tmp.long_value;
|
|
|
|
}
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
Main handling of variables:
|
|
|
|
- Initialisation
|
|
|
|
- Searching during parsing
|
|
|
|
- Update loop
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find variable name in option my_getopt structure used for command line args
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
find_option()
|
|
|
|
opt option structure array to search in
|
|
|
|
name variable name
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
0 Error
|
|
|
|
ptr pointer to option structure
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct my_option *find_option(struct my_option *opt, const char *name)
|
|
|
|
{
|
|
|
|
uint length=strlen(name);
|
|
|
|
for (; opt->name; opt++)
|
|
|
|
{
|
|
|
|
if (!getopt_compare_strings(opt->name, name, length) &&
|
|
|
|
!opt->name[length])
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Only accept the option if one can set values through it.
|
|
|
|
If not, there is no default value or limits in the option.
|
|
|
|
*/
|
|
|
|
return (opt->value) ? opt : 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Return variable name and length for hashing of variables
|
|
|
|
*/
|
|
|
|
|
|
|
|
static byte *get_sys_var_length(const sys_var *var, uint *length,
|
|
|
|
my_bool first)
|
|
|
|
{
|
|
|
|
*length= var->name_length;
|
|
|
|
return (byte*) var->name;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Initialises sys variables and put them in system_variable_hash
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
void set_var_init()
|
|
|
|
{
|
2002-10-02 12:33:08 +02:00
|
|
|
hash_init(&system_variable_hash, system_charset_info,
|
|
|
|
array_elements(sys_variables),0,0,
|
2003-04-01 09:45:16 +02:00
|
|
|
(hash_get_key) get_sys_var_length,0,0);
|
2002-07-23 17:31:22 +02:00
|
|
|
sys_var **var, **end;
|
|
|
|
for (var= sys_variables, end= sys_variables+array_elements(sys_variables) ;
|
|
|
|
var < end;
|
|
|
|
var++)
|
|
|
|
{
|
|
|
|
(*var)->name_length= strlen((*var)->name);
|
|
|
|
(*var)->option_limits= find_option(my_long_options, (*var)->name);
|
2003-09-19 11:44:31 +02:00
|
|
|
my_hash_insert(&system_variable_hash, (byte*) *var);
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
Special cases
|
|
|
|
Needed because MySQL can't find the limits for a variable it it has
|
|
|
|
a different name than the command line option.
|
|
|
|
As these variables are deprecated, this code will disappear soon...
|
|
|
|
*/
|
|
|
|
sys_sql_max_join_size.option_limits= sys_max_join_size.option_limits;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void set_var_free()
|
|
|
|
{
|
|
|
|
hash_free(&system_variable_hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find a user set-table variable
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
find_sys_var()
|
|
|
|
str Name of system variable to find
|
|
|
|
length Length of variable. zero means that we should use strlen()
|
|
|
|
on the variable
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
We have to use net_printf() as this is called during the parsing stage
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
pointer pointer to variable definitions
|
|
|
|
0 Unknown variable (error message is given)
|
|
|
|
*/
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
sys_var *find_sys_var(const char *str, uint length)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2002-08-28 16:00:58 +02:00
|
|
|
sys_var *var= (sys_var*) hash_search(&system_variable_hash,
|
|
|
|
(byte*) str,
|
2002-07-23 17:31:22 +02:00
|
|
|
length ? length :
|
|
|
|
strlen(str));
|
|
|
|
if (!var)
|
2002-10-02 12:33:08 +02:00
|
|
|
net_printf(current_thd, ER_UNKNOWN_SYSTEM_VARIABLE, (char*) str);
|
2002-07-23 17:31:22 +02:00
|
|
|
return var;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Execute update of all variables
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
|
|
|
sql_set
|
|
|
|
THD Thread id
|
|
|
|
set_var List of variables to update
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
First run a check of all variables that all updates will go ok.
|
|
|
|
If yes, then execute all updates, returning an error if any one failed.
|
|
|
|
|
|
|
|
This should ensure that in all normal cases none all or variables are
|
|
|
|
updated
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 ok
|
2002-09-22 17:02:39 +02:00
|
|
|
1 ERROR, message sent (normally no variables was updated)
|
|
|
|
-1 ERROR, message not sent
|
2002-07-23 17:31:22 +02:00
|
|
|
*/
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int sql_set_variables(THD *thd, List<set_var_base> *var_list)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2002-09-22 17:02:39 +02:00
|
|
|
int error= 0;
|
2003-05-27 17:40:37 +02:00
|
|
|
List_iterator_fast<set_var_base> it(*var_list);
|
2003-08-18 23:08:08 +02:00
|
|
|
DBUG_ENTER("sql_set_variables");
|
2002-07-23 17:31:22 +02:00
|
|
|
|
|
|
|
set_var_base *var;
|
|
|
|
while ((var=it++))
|
|
|
|
{
|
2002-09-22 17:02:39 +02:00
|
|
|
if ((error=var->check(thd)))
|
2003-08-18 23:08:08 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
2003-10-24 16:28:32 +02:00
|
|
|
if (thd->net.report_error)
|
|
|
|
DBUG_RETURN(1);
|
2002-07-23 17:31:22 +02:00
|
|
|
it.rewind();
|
|
|
|
while ((var=it++))
|
2002-09-22 17:02:39 +02:00
|
|
|
error|= var->update(thd); // Returns 0, -1 or 1
|
2003-08-18 23:08:08 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Implementation of WL#1824 "Add replication of character set variables in 4.1",
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
mysql-test/r/rpl_server_id1.result:
it's normal to not run as I have added a test to compare server ids of master and slave
at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
result update (as we now print charset of user var).
mysql-test/r/user_var.result:
result update
mysql-test/t/rpl_server_id1.test:
no need to select as slave is not running
mysql-test/t/user_var.test:
testing if the content of user vars is escaped when mysqlbinlog prints them,
and if the name is backquoted.
sql/lex.h:
new keyword ONE_SHOT
sql/log.cc:
when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
escape the content of the var. Backquote its name.
Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
as it will make the master or slave make wrong assumptions.
A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
when I/O slave thread starts, verify that master's and slave charsets match.
And by the way verify that server ids are different.
Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
not fatal.
sql/sql_class.cc:
one_shot
sql/sql_class.h:
one_shot
sql/sql_lex.h:
one_shot
sql/sql_parse.cc:
when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
otherwise refuse.
sql/sql_yacc.yy:
ONE_SHOT keyword in SET
2004-06-03 23:17:18 +02:00
|
|
|
/*
|
|
|
|
Say if all variables set by a SET support the ONE_SHOT keyword (currently,
|
|
|
|
only character set and collation do; later timezones will).
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
|
|
|
not_all_support_one_shot
|
|
|
|
set_var List of variables to update
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
It has a "not_" because it makes faster tests (no need to "!")
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 all variables of the list support ONE_SHOT
|
|
|
|
1 at least one does not support ONE_SHOT
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool not_all_support_one_shot(List<set_var_base> *var_list)
|
|
|
|
{
|
|
|
|
List_iterator_fast<set_var_base> it(*var_list);
|
|
|
|
set_var_base *var;
|
|
|
|
while ((var= it++))
|
|
|
|
{
|
|
|
|
if (var->no_support_one_shot())
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
Functions to handle SET mysql_internal_variable=const_expr
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var::check(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (var->check_type(type))
|
|
|
|
{
|
|
|
|
my_error(type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE,
|
|
|
|
MYF(0),
|
|
|
|
var->name);
|
2002-09-22 17:02:39 +02:00
|
|
|
return -1;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
if ((type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)))
|
|
|
|
return 1;
|
|
|
|
/* value is a NULL pointer if we are using SET ... = DEFAULT */
|
|
|
|
if (!value)
|
|
|
|
{
|
|
|
|
if (var->check_default(type))
|
|
|
|
{
|
|
|
|
my_error(ER_NO_DEFAULT, MYF(0), var->name);
|
2002-09-22 17:02:39 +02:00
|
|
|
return -1;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-01-21 12:55:26 +01:00
|
|
|
if (value->fix_fields(thd, 0, &value) || value->check_cols(1))
|
2002-09-22 17:02:39 +02:00
|
|
|
return -1;
|
2002-07-23 17:31:22 +02:00
|
|
|
if (var->check_update_type(value->result_type()))
|
|
|
|
{
|
|
|
|
my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), var->name);
|
2002-09-22 17:02:39 +02:00
|
|
|
return -1;
|
2003-10-06 14:11:16 +02:00
|
|
|
}
|
2002-09-22 17:02:39 +02:00
|
|
|
return var->check(thd, this) ? -1 : 0;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-04-10 00:14:32 +02:00
|
|
|
/*
|
|
|
|
Check variable, but without assigning value (used by PS)
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_var::light_check()
|
|
|
|
thd thread handler
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 ok
|
|
|
|
1 ERROR, message sent (normally no variables was updated)
|
|
|
|
-1 ERROR, message not sent
|
|
|
|
*/
|
new error for unsupported command in PS
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
include/mysqld_error.h:
new error for unsupported command in PS
mysql-test/r/multi_update.result:
test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
some function frop sql_parse.h become public
sql/set_var.cc:
check for SET command via PS
sql/set_var.h:
check for SET command via PS
sql/share/czech/errmsg.txt:
new error for unsupported command in PS
sql/share/danish/errmsg.txt:
new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
new error for unsupported command in PS
sql/share/english/errmsg.txt:
new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
new error for unsupported command in PS
sql/share/french/errmsg.txt:
new error for unsupported command in PS
sql/share/german/errmsg.txt:
new error for unsupported command in PS
sql/share/greek/errmsg.txt:
new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
new error for unsupported command in PS
sql/share/italian/errmsg.txt:
new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
new error for unsupported command in PS
sql/share/korean/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
new error for unsupported command in PS
sql/share/polish/errmsg.txt:
new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
new error for unsupported command in PS
sql/share/russian/errmsg.txt:
new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
new error for unsupported command in PS
sql/sql_lex.cc:
first table unlincking procedures for CREATE command
sql/sql_lex.h:
first table unlincking procedures for CREATE command
sql/sql_parse.cc:
used function to exclude first table from list
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
fixed a lot of commands to be compatible with PS
unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
allow empty result for PS preparing
sql/sql_union.cc:
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
fixed update to use correct tables lists (BUG#3408)
sql/table.h:
flag to support multi update tables check (BUG#3408)
tests/client_test.c:
removed unsupported tables
fixed show table test
added new tests
2004-04-07 23:16:17 +02:00
|
|
|
int set_var::light_check(THD *thd)
|
|
|
|
{
|
|
|
|
if (var->check_type(type))
|
|
|
|
{
|
|
|
|
my_error(type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE,
|
|
|
|
MYF(0),
|
|
|
|
var->name);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-10 00:14:32 +02:00
|
|
|
if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL))
|
new error for unsupported command in PS
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
include/mysqld_error.h:
new error for unsupported command in PS
mysql-test/r/multi_update.result:
test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
some function frop sql_parse.h become public
sql/set_var.cc:
check for SET command via PS
sql/set_var.h:
check for SET command via PS
sql/share/czech/errmsg.txt:
new error for unsupported command in PS
sql/share/danish/errmsg.txt:
new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
new error for unsupported command in PS
sql/share/english/errmsg.txt:
new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
new error for unsupported command in PS
sql/share/french/errmsg.txt:
new error for unsupported command in PS
sql/share/german/errmsg.txt:
new error for unsupported command in PS
sql/share/greek/errmsg.txt:
new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
new error for unsupported command in PS
sql/share/italian/errmsg.txt:
new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
new error for unsupported command in PS
sql/share/korean/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
new error for unsupported command in PS
sql/share/polish/errmsg.txt:
new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
new error for unsupported command in PS
sql/share/russian/errmsg.txt:
new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
new error for unsupported command in PS
sql/sql_lex.cc:
first table unlincking procedures for CREATE command
sql/sql_lex.h:
first table unlincking procedures for CREATE command
sql/sql_parse.cc:
used function to exclude first table from list
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
fixed a lot of commands to be compatible with PS
unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
allow empty result for PS preparing
sql/sql_union.cc:
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
fixed update to use correct tables lists (BUG#3408)
sql/table.h:
flag to support multi update tables check (BUG#3408)
tests/client_test.c:
removed unsupported tables
fixed show table test
added new tests
2004-04-07 23:16:17 +02:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (value && (value->fix_fields(thd, 0, &value) || value->check_cols(1)))
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var::update(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (!value)
|
|
|
|
var->set_default(thd, type);
|
|
|
|
else if (var->update(thd, this))
|
2002-09-22 17:02:39 +02:00
|
|
|
return -1; // should never happen
|
2002-07-23 17:31:22 +02:00
|
|
|
if (var->after_update)
|
|
|
|
(*var->after_update)(thd, type);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
Functions to handle SET @user_variable=const_expr
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var_user::check(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2003-11-02 16:27:35 +01:00
|
|
|
/*
|
|
|
|
Item_func_set_user_var can't substitute something else on its place =>
|
2004-02-18 00:08:52 +01:00
|
|
|
0 can be passed as last argument (reference on item)
|
2003-11-02 16:27:35 +01:00
|
|
|
*/
|
|
|
|
return (user_var_item->fix_fields(thd, 0, (Item**) 0) ||
|
2003-10-24 16:28:32 +02:00
|
|
|
user_var_item->check()) ? -1 : 0;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-04-10 00:14:32 +02:00
|
|
|
/*
|
|
|
|
Check variable, but without assigning value (used by PS)
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_var_user::light_check()
|
|
|
|
thd thread handler
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 ok
|
|
|
|
1 ERROR, message sent (normally no variables was updated)
|
|
|
|
-1 ERROR, message not sent
|
|
|
|
*/
|
new error for unsupported command in PS
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
include/mysqld_error.h:
new error for unsupported command in PS
mysql-test/r/multi_update.result:
test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
some function frop sql_parse.h become public
sql/set_var.cc:
check for SET command via PS
sql/set_var.h:
check for SET command via PS
sql/share/czech/errmsg.txt:
new error for unsupported command in PS
sql/share/danish/errmsg.txt:
new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
new error for unsupported command in PS
sql/share/english/errmsg.txt:
new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
new error for unsupported command in PS
sql/share/french/errmsg.txt:
new error for unsupported command in PS
sql/share/german/errmsg.txt:
new error for unsupported command in PS
sql/share/greek/errmsg.txt:
new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
new error for unsupported command in PS
sql/share/italian/errmsg.txt:
new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
new error for unsupported command in PS
sql/share/korean/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
new error for unsupported command in PS
sql/share/polish/errmsg.txt:
new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
new error for unsupported command in PS
sql/share/russian/errmsg.txt:
new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
new error for unsupported command in PS
sql/sql_lex.cc:
first table unlincking procedures for CREATE command
sql/sql_lex.h:
first table unlincking procedures for CREATE command
sql/sql_parse.cc:
used function to exclude first table from list
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
fixed a lot of commands to be compatible with PS
unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
allow empty result for PS preparing
sql/sql_union.cc:
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
fixed update to use correct tables lists (BUG#3408)
sql/table.h:
flag to support multi update tables check (BUG#3408)
tests/client_test.c:
removed unsupported tables
fixed show table test
added new tests
2004-04-07 23:16:17 +02:00
|
|
|
int set_var_user::light_check(THD *thd)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Item_func_set_user_var can't substitute something else on its place =>
|
|
|
|
0 can be passed as last argument (reference on item)
|
|
|
|
*/
|
|
|
|
return (user_var_item->fix_fields(thd, 0, (Item**) 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var_user::update(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
|
|
|
if (user_var_item->update())
|
|
|
|
{
|
|
|
|
/* Give an error if it's not given already */
|
2002-09-22 17:02:39 +02:00
|
|
|
my_error(ER_SET_CONSTANTS_ONLY, MYF(0));
|
|
|
|
return -1;
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
Functions to handle SET PASSWORD
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var_password::check(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2003-09-26 12:33:13 +02:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2002-07-23 17:31:22 +02:00
|
|
|
if (!user->host.str)
|
|
|
|
user->host.str= (char*) thd->host_or_ip;
|
2002-09-22 17:02:39 +02:00
|
|
|
/* Returns 1 as the function sends error to client */
|
2004-07-30 22:05:08 +02:00
|
|
|
return check_change_password(thd, user->host.str, user->user.str, password) ?
|
|
|
|
1 : 0;
|
|
|
|
#else
|
2003-09-26 12:33:13 +02:00
|
|
|
return 0;
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
2002-09-22 17:02:39 +02:00
|
|
|
int set_var_password::update(THD *thd)
|
2002-07-23 17:31:22 +02:00
|
|
|
{
|
2003-09-26 12:33:13 +02:00
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
2002-09-22 17:02:39 +02:00
|
|
|
/* Returns 1 as the function sends error to client */
|
2004-07-30 22:05:08 +02:00
|
|
|
return change_password(thd, user->host.str, user->user.str, password) ?
|
|
|
|
1 : 0;
|
2003-09-26 12:33:13 +02:00
|
|
|
#else
|
|
|
|
return 0;
|
|
|
|
#endif
|
2002-07-23 17:31:22 +02:00
|
|
|
}
|
|
|
|
|
2003-12-02 21:23:13 +01:00
|
|
|
/****************************************************************************
|
|
|
|
Functions to handle table_type
|
|
|
|
****************************************************************************/
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
/* Based upon sys_var::check_enum() */
|
|
|
|
|
2003-12-17 23:52:03 +01:00
|
|
|
bool sys_var_thd_storage_engine::check(THD *thd, set_var *var)
|
2003-12-02 21:23:13 +01:00
|
|
|
{
|
|
|
|
char buff[80];
|
|
|
|
const char *value;
|
|
|
|
String str(buff, sizeof(buff), &my_charset_latin1), *res;
|
|
|
|
|
|
|
|
if (var->value->result_type() == STRING_RESULT)
|
|
|
|
{
|
|
|
|
if (!(res=var->value->val_str(&str)) ||
|
|
|
|
!(var->save_result.ulong_value=
|
|
|
|
(ulong) ha_resolve_by_name(res->ptr(), res->length())))
|
|
|
|
{
|
|
|
|
value= res ? res->c_ptr() : "NULL";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2003-12-19 15:25:50 +01:00
|
|
|
value= "unknown";
|
2003-12-02 21:23:13 +01:00
|
|
|
|
|
|
|
err:
|
2003-12-17 23:52:03 +01:00
|
|
|
my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), value);
|
2003-12-02 21:23:13 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
|
2003-12-17 23:52:03 +01:00
|
|
|
byte *sys_var_thd_storage_engine::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2003-12-02 21:23:13 +01:00
|
|
|
{
|
|
|
|
ulong val;
|
|
|
|
val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
|
|
|
|
thd->variables.*offset);
|
2003-12-17 23:52:03 +01:00
|
|
|
const char *table_type= ha_get_storage_engine((enum db_type)val);
|
2003-12-08 11:25:37 +01:00
|
|
|
return (byte *) table_type;
|
2003-12-02 21:23:13 +01:00
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
|
2003-12-17 23:52:03 +01:00
|
|
|
void sys_var_thd_storage_engine::set_default(THD *thd, enum_var_type type)
|
2003-12-02 21:23:13 +01:00
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= (ulong) DB_TYPE_MYISAM;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= (ulong) (global_system_variables.*offset);
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
|
2003-12-17 23:52:03 +01:00
|
|
|
bool sys_var_thd_storage_engine::update(THD *thd, set_var *var)
|
2003-12-02 21:23:13 +01:00
|
|
|
{
|
|
|
|
if (var->type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= var->save_result.ulong_value;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= var->save_result.ulong_value;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-17 23:52:03 +01:00
|
|
|
void sys_var_thd_table_type::warn_deprecated(THD *thd)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_WARN_DEPRECATED_SYNTAX,
|
|
|
|
ER(ER_WARN_DEPRECATED_SYNTAX), "table_type", "storage_engine");
|
|
|
|
}
|
|
|
|
|
|
|
|
void sys_var_thd_table_type::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
warn_deprecated(thd);
|
|
|
|
sys_var_thd_storage_engine::set_default(thd, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool sys_var_thd_table_type::update(THD *thd, set_var *var)
|
|
|
|
{
|
|
|
|
warn_deprecated(thd);
|
|
|
|
return sys_var_thd_storage_engine::update(thd, var);
|
|
|
|
}
|
|
|
|
|
2003-12-08 11:25:37 +01:00
|
|
|
|
2003-06-04 17:28:51 +02:00
|
|
|
/****************************************************************************
|
|
|
|
Functions to handle sql_mode
|
|
|
|
****************************************************************************/
|
2003-04-05 12:59:29 +02:00
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
byte *sys_var_thd_sql_mode::value_ptr(THD *thd, enum_var_type type,
|
|
|
|
LEX_STRING *base)
|
2003-06-04 17:28:51 +02:00
|
|
|
{
|
|
|
|
ulong val;
|
|
|
|
char buff[256];
|
|
|
|
String tmp(buff, sizeof(buff), &my_charset_latin1);
|
|
|
|
|
|
|
|
tmp.length(0);
|
|
|
|
val= ((type == OPT_GLOBAL) ? global_system_variables.*offset :
|
|
|
|
thd->variables.*offset);
|
|
|
|
for (uint i= 0; val; val>>= 1, i++)
|
|
|
|
{
|
|
|
|
if (val & 1)
|
|
|
|
{
|
|
|
|
tmp.append(enum_names->type_names[i]);
|
|
|
|
tmp.append(',');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (tmp.length())
|
|
|
|
tmp.length(tmp.length() - 1);
|
|
|
|
return (byte*) thd->strmake(tmp.ptr(), tmp.length());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void sys_var_thd_sql_mode::set_default(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.*offset= 0;
|
|
|
|
else
|
|
|
|
thd->variables.*offset= global_system_variables.*offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
void fix_sql_mode_var(THD *thd, enum_var_type type)
|
|
|
|
{
|
|
|
|
if (type == OPT_GLOBAL)
|
|
|
|
global_system_variables.sql_mode=
|
|
|
|
fix_sql_mode(global_system_variables.sql_mode);
|
|
|
|
else
|
|
|
|
thd->variables.sql_mode= fix_sql_mode(thd->variables.sql_mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Map database specific bits to function bits */
|
2003-04-05 12:59:29 +02:00
|
|
|
|
2003-06-04 17:28:51 +02:00
|
|
|
ulong fix_sql_mode(ulong sql_mode)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Note that we dont set
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | MODE_NO_FIELD_OPTIONS
|
|
|
|
to allow one to get full use of MySQL in this mode.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (sql_mode & MODE_ANSI)
|
|
|
|
sql_mode|= (MODE_REAL_AS_FLOAT | MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE | MODE_ONLY_FULL_GROUP_BY);
|
|
|
|
if (sql_mode & MODE_ORACLE)
|
|
|
|
sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE |
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
|
|
|
|
MODE_NO_FIELD_OPTIONS);
|
|
|
|
if (sql_mode & MODE_MSSQL)
|
|
|
|
sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE |
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
|
|
|
|
MODE_NO_FIELD_OPTIONS);
|
|
|
|
if (sql_mode & MODE_POSTGRESQL)
|
|
|
|
sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE |
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
|
|
|
|
MODE_NO_FIELD_OPTIONS);
|
|
|
|
if (sql_mode & MODE_DB2)
|
|
|
|
sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE |
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
|
|
|
|
MODE_NO_FIELD_OPTIONS);
|
2003-10-15 11:50:36 +02:00
|
|
|
if (sql_mode & MODE_MAXDB)
|
2003-06-04 17:28:51 +02:00
|
|
|
sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
|
|
MODE_IGNORE_SPACE |
|
|
|
|
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
|
|
|
|
MODE_NO_FIELD_OPTIONS);
|
|
|
|
if (sql_mode & MODE_MYSQL40)
|
|
|
|
sql_mode|= MODE_NO_FIELD_OPTIONS;
|
|
|
|
if (sql_mode & MODE_MYSQL323)
|
|
|
|
sql_mode|= MODE_NO_FIELD_OPTIONS;
|
|
|
|
return sql_mode;
|
|
|
|
}
|
2003-04-05 12:59:29 +02:00
|
|
|
|
|
|
|
|
2003-07-06 18:09:57 +02:00
|
|
|
/****************************************************************************
|
|
|
|
Named list handling
|
|
|
|
****************************************************************************/
|
|
|
|
|
2003-08-18 23:08:08 +02:00
|
|
|
gptr find_named(I_List<NAMED_LIST> *list, const char *name, uint length,
|
|
|
|
NAMED_LIST **found)
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
|
|
|
I_List_iterator<NAMED_LIST> it(*list);
|
|
|
|
NAMED_LIST *element;
|
|
|
|
while ((element= it++))
|
|
|
|
{
|
|
|
|
if (element->cmp(name, length))
|
2003-08-18 23:08:08 +02:00
|
|
|
{
|
2003-08-27 00:14:13 +02:00
|
|
|
if (found)
|
|
|
|
*found= element;
|
2003-07-06 18:09:57 +02:00
|
|
|
return element->data;
|
2003-08-18 23:08:08 +02:00
|
|
|
}
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-18 12:47:27 +01:00
|
|
|
void delete_elements(I_List<NAMED_LIST> *list,
|
|
|
|
void (*free_element)(const char *name, gptr))
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
|
|
|
NAMED_LIST *element;
|
2003-08-18 23:08:08 +02:00
|
|
|
DBUG_ENTER("delete_elements");
|
2003-07-06 18:09:57 +02:00
|
|
|
while ((element= list->get()))
|
|
|
|
{
|
2003-11-18 12:47:27 +01:00
|
|
|
(*free_element)(element->name, element->data);
|
2003-07-06 18:09:57 +02:00
|
|
|
delete element;
|
|
|
|
}
|
2003-08-18 23:08:08 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Key cache functions */
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
static KEY_CACHE *create_key_cache(const char *name, uint length)
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache;
|
2003-11-18 12:47:27 +01:00
|
|
|
DBUG_ENTER("create_key_cache");
|
|
|
|
DBUG_PRINT("enter",("name: %.*s", length, name));
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
if ((key_cache= (KEY_CACHE*) my_malloc(sizeof(KEY_CACHE),
|
2003-11-18 12:47:27 +01:00
|
|
|
MYF(MY_ZEROFILL | MY_WME))))
|
2003-08-02 11:43:18 +02:00
|
|
|
{
|
|
|
|
if (!new NAMED_LIST(&key_caches, name, length, (gptr) key_cache))
|
2003-11-18 12:47:27 +01:00
|
|
|
{
|
|
|
|
my_free((char*) key_cache, MYF(0));
|
2003-08-02 11:43:18 +02:00
|
|
|
key_cache= 0;
|
2003-11-18 12:47:27 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Set default values for a key cache
|
|
|
|
The values in dflt_key_cache_var is set by my_getopt() at startup
|
|
|
|
|
|
|
|
We don't set 'buff_size' as this is used to enable the key cache
|
|
|
|
*/
|
2003-11-20 21:06:25 +01:00
|
|
|
key_cache->param_block_size= dflt_key_cache_var.param_block_size;
|
|
|
|
key_cache->param_division_limit= dflt_key_cache_var.param_division_limit;
|
|
|
|
key_cache->param_age_threshold= dflt_key_cache_var.param_age_threshold;
|
2003-11-18 12:47:27 +01:00
|
|
|
}
|
2003-08-02 11:43:18 +02:00
|
|
|
}
|
2003-11-18 12:47:27 +01:00
|
|
|
DBUG_RETURN(key_cache);
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *get_or_create_key_cache(const char *name, uint length)
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
2003-08-02 11:43:18 +02:00
|
|
|
LEX_STRING key_cache_name;
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache;
|
2003-11-18 12:47:27 +01:00
|
|
|
|
2003-08-02 11:43:18 +02:00
|
|
|
key_cache_name.str= (char *) name;
|
|
|
|
key_cache_name.length= length;
|
2003-11-18 12:47:27 +01:00
|
|
|
pthread_mutex_lock(&LOCK_global_system_variables);
|
|
|
|
if (!(key_cache= get_key_cache(&key_cache_name)))
|
2003-07-06 18:09:57 +02:00
|
|
|
key_cache= create_key_cache(name, length);
|
2003-11-18 12:47:27 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_global_system_variables);
|
2003-07-06 18:09:57 +02:00
|
|
|
return key_cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
void free_key_cache(const char *name, KEY_CACHE *key_cache)
|
2003-07-06 18:09:57 +02:00
|
|
|
{
|
2003-11-18 12:47:27 +01:00
|
|
|
ha_end_key_cache(key_cache);
|
|
|
|
my_free((char*) key_cache, MYF(0));
|
2003-08-02 11:43:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-11-20 21:06:25 +01:00
|
|
|
bool process_key_caches(int (* func) (const char *name, KEY_CACHE *))
|
2003-11-18 12:47:27 +01:00
|
|
|
{
|
2003-08-02 11:43:18 +02:00
|
|
|
I_List_iterator<NAMED_LIST> it(key_caches);
|
|
|
|
NAMED_LIST *element;
|
2003-11-18 12:47:27 +01:00
|
|
|
|
2003-08-02 11:43:18 +02:00
|
|
|
while ((element= it++))
|
|
|
|
{
|
2003-11-20 21:06:25 +01:00
|
|
|
KEY_CACHE *key_cache= (KEY_CACHE *) element->data;
|
2003-11-18 12:47:27 +01:00
|
|
|
func(element->name, key_cache);
|
2003-08-02 11:43:18 +02:00
|
|
|
}
|
|
|
|
return 0;
|
2003-07-06 18:09:57 +02:00
|
|
|
}
|
|
|
|
|
2003-04-05 12:59:29 +02:00
|
|
|
|
2002-07-23 17:31:22 +02:00
|
|
|
/****************************************************************************
|
|
|
|
Used templates
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
template class List<set_var_base>;
|
2003-05-27 17:40:37 +02:00
|
|
|
template class List_iterator_fast<set_var_base>;
|
2003-07-06 18:09:57 +02:00
|
|
|
template class I_List_iterator<NAMED_LIST>;
|
2002-07-23 17:31:22 +02:00
|
|
|
#endif
|