Commit c890c312 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0 

into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.0
parents eadfe4dd 52236ae1

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ jani@rhols221.adsl.netsonic.fi 
jani@rhols221.arenanet.fi

jani@ua126d19.elisa.omakaista.fi

jani@ua141d10.elisa.omakaista.fi

jani@ua72d24.elisa.omakaista.fi

jcole@abel.spaceapes.com

jcole@main.burghcom.com

jcole@mugatu.spaceapes.com

client/mysqlbinlog.cc

+5 −2
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void die(const char* fmt, ...) 


static void print_version()

{

  printf("%s Ver 2.5 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

  printf("%s Ver 2.6 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);

}
@@ -562,9 +562,12 @@ static int parse_args(int *argc, char*** argv) 
static MYSQL* safe_connect()

{

  MYSQL *local_mysql = mysql_init(NULL);



  if(!local_mysql)

    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))

    die("failed on connect: %s", mysql_error(local_mysql));

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ extern ulong ha_read_first_count, ha_read_last_count; 
extern ulong ha_read_rnd_count, ha_read_rnd_next_count;

extern ulong ha_commit_count, ha_rollback_count,table_cache_size;

extern ulong max_connections,max_connect_errors, connect_timeout;

extern ulong max_insert_delayed_threads, max_user_connections;

extern ulong max_user_connections;

extern ulong long_query_count, what_to_log,flush_time,opt_sql_mode;

extern ulong query_buff_size, thread_stack,thread_stack_min;

extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;

sql/mysqld.cc

+5 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ ulong select_range_check_count, select_range_count, select_scan_count; 
ulong select_full_range_join_count,select_full_join_count;

ulong specialflag=0,opened_tables=0,created_tmp_tables=0,

      created_tmp_disk_tables=0;

ulong max_connections,max_insert_delayed_threads,max_used_connections,

ulong max_connections, max_used_connections,

      max_connect_errors, max_user_connections = 0;

ulong thread_id=1L,current_pid;

ulong slow_launch_threads = 0;
@@ -1726,7 +1726,8 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) 
    This should actually be '+ max_number_of_slaves' instead of +10,

    but the +10 should be quite safe.

  */

  init_thr_alarm(max_connections+max_insert_delayed_threads+10);

  init_thr_alarm(max_connections +

		 global_system_variables.max_insert_delayed_threads + 10);

#if SIGINT != THR_KILL_SIGNAL

  if (test_flags & TEST_SIGINT)

  {
@@ -3896,7 +3897,8 @@ The minimum value for this variable is 4096.", 
    REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ~0L, 0, 1, 0},

  {"max_delayed_threads", OPT_MAX_DELAYED_THREADS,

   "Don't start more than this number of threads to handle INSERT DELAYED statements. If set to zero, which means INSERT DELAYED is not used.",

   (gptr*) &max_insert_delayed_threads, (gptr*) &max_insert_delayed_threads,

   (gptr*) &global_system_variables.max_insert_delayed_threads,

   (gptr*) &max_system_variables.max_insert_delayed_threads,

   0, GET_ULONG, REQUIRED_ARG, 20, 0, 16384, 0, 1, 0},

  {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,

   "Don't allow creation of heap tables bigger than this.",

sql/set_var.cc

+7 −3
Original line number Diff line number Diff line
@@ -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);

}