diff options
| author | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-04 17:58:36 +0000 |
|---|---|---|
| committer | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-04 17:58:36 +0000 |
| commit | c29415cb345e386b18983fcbb36cece7e1f940fb (patch) | |
| tree | 9e9896821fbad442c2079c187c49119f392976b8 /sql/set_var.cc | |
| parent | 472086d64e6c1ae93c0227e1118a7101879960f1 (diff) | |
| download | mariadb-git-c29415cb345e386b18983fcbb36cece7e1f940fb.tar.gz | |
Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
sql/mysql_priv.h:
New session variable, max_insert_delayed_threads
sql/mysqld.cc:
New session variable, max_insert_delayed_threads
sql/set_var.cc:
New session variable, max_insert_delayed_threads
sql/sql_class.h:
New session variable, max_insert_delayed_threads
sql/sql_insert.cc:
New session variable, max_insert_delayed_threads
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 9b605cacb97..539109d994c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -155,8 +155,10 @@ sys_var_long_ptr sys_max_connections("max_connections", fix_max_connections); sys_var_long_ptr sys_max_connect_errors("max_connect_errors", &max_connect_errors); -sys_var_long_ptr sys_max_delayed_threads("max_delayed_threads", - &max_insert_delayed_threads, +sys_var_thd_ulong sys_max_insert_delayed_threads("max_insert_delayed_threads", + &SV::max_insert_delayed_threads); +sys_var_thd_ulong sys_max_delayed_threads("max_delayed_threads", + &SV::max_insert_delayed_threads, fix_max_connections); sys_var_thd_ulong sys_max_heap_table_size("max_heap_table_size", &SV::max_heap_table_size); @@ -381,6 +383,7 @@ sys_var *sys_variables[]= &sys_max_connect_errors, &sys_max_connections, &sys_max_delayed_threads, + &sys_max_insert_delayed_threads, &sys_max_heap_table_size, &sys_max_join_size, &sys_max_relay_log_size, @@ -771,7 +774,8 @@ static void fix_max_relay_log_size(THD *thd, enum_var_type type) static void fix_max_connections(THD *thd, enum_var_type type) { - resize_thr_alarm(max_connections + max_insert_delayed_threads + 10); + resize_thr_alarm(max_connections + + global_system_variables.max_insert_delayed_threads + 10); } |