Commit 24f85213 authored by unknown's avatar unknown

Small fixes.


client/mysqlbinlog.cc:
  Patched patch for Bug#2491.
sql/set_var.cc:
  Added max_insert_delayed_threads into 'SHOW VARIABLES'.
parent 37678666
...@@ -306,6 +306,7 @@ int process_event(ulonglong *rec_count, char *last_db, Log_event *ev, ...@@ -306,6 +306,7 @@ int process_event(ulonglong *rec_count, char *last_db, Log_event *ev,
my_off_t pos, int old_format) my_off_t pos, int old_format)
{ {
char ll_buff[21]; char ll_buff[21];
if ((*rec_count) >= offset) if ((*rec_count) >= offset)
{ {
if (!short_form) if (!short_form)
...@@ -566,8 +567,6 @@ static MYSQL* safe_connect() ...@@ -566,8 +567,6 @@ static MYSQL* safe_connect()
if(!local_mysql) if(!local_mysql)
die("Failed on mysql_init"); die("Failed on mysql_init");
mysql_options(local_mysql, MYSQL_INIT_COMMAND,
"/*!32210 SET @@session.max_insert_delayed_threads=0*/");
if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0)) if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))
die("failed on connect: %s", mysql_error(local_mysql)); die("failed on connect: %s", mysql_error(local_mysql));
...@@ -952,6 +951,8 @@ int main(int argc, char** argv) ...@@ -952,6 +951,8 @@ int main(int argc, char** argv)
load_processor.init_by_cur_dir(); load_processor.init_by_cur_dir();
exit_value= 0; exit_value= 0;
fprintf(result_file,
"/*!40001 SET @@session.max_insert_delayed_threads=0*/;\n");
while (--argc >= 0) while (--argc >= 0)
{ {
if (dump_log_entries(*(argv++))) if (dump_log_entries(*(argv++)))
......
...@@ -550,6 +550,8 @@ struct show_var_st init_vars[]= { ...@@ -550,6 +550,8 @@ struct show_var_st init_vars[]= {
{sys_max_connections.name, (char*) &sys_max_connections, SHOW_SYS}, {sys_max_connections.name, (char*) &sys_max_connections, SHOW_SYS},
{sys_max_connect_errors.name, (char*) &sys_max_connect_errors, SHOW_SYS}, {sys_max_connect_errors.name, (char*) &sys_max_connect_errors, SHOW_SYS},
{sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads, SHOW_SYS}, {sys_max_delayed_threads.name,(char*) &sys_max_delayed_threads, SHOW_SYS},
{sys_max_insert_delayed_threads.name,
(char*) &sys_max_insert_delayed_threads, SHOW_SYS},
{sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size, SHOW_SYS}, {sys_max_heap_table_size.name,(char*) &sys_max_heap_table_size, SHOW_SYS},
{sys_max_join_size.name, (char*) &sys_max_join_size, SHOW_SYS}, {sys_max_join_size.name, (char*) &sys_max_join_size, SHOW_SYS},
{sys_max_relay_log_size.name, (char*) &sys_max_relay_log_size, SHOW_SYS}, {sys_max_relay_log_size.name, (char*) &sys_max_relay_log_size, SHOW_SYS},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment