Merge lp:~linuxjedi/drizzle/trunk-bug-680872 into lp:drizzle/7.0

[Andrew Hutchings]

max-connect-errors is completely unused, this branch kills it.

=== modified file 'drizzled/definitions.h'
--- drizzled/definitions.h	2010-12-18 04:43:40 +0000
+++ drizzled/definitions.h	2011-01-16 11:24:59 +0000
@@ -197,7 +197,6 @@
 /* The following can also be changed from the command line */
 #define DEFAULT_CONCURRENCY	10
 #define FLUSH_TIME		0		/**< Don't flush tables */
-#define MAX_CONNECT_ERRORS	10		///< errors before disabling host
 
 /* Bits from testflag */
 enum test_flag_bit
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2011-01-11 07:12:09 +0000
+++ drizzled/drizzled.cc	2011-01-16 11:24:59 +0000
@@ -254,7 +254,6 @@
 uint32_t server_id;
 uint64_t table_cache_size;
 size_t table_def_size;
-uint64_t max_connect_errors;
 uint32_t global_thread_id= 1UL;
 pid_t current_pid;
 
@@ -814,17 +813,6 @@
   global_system_variables.max_allowed_packet= in_max_allowed_packet;
 }
 
-static void check_limits_mce(uint64_t in_max_connect_errors)
-{
-  max_connect_errors= MAX_CONNECT_ERRORS;
-  if (in_max_connect_errors < 1 || in_max_connect_errors > ULONG_MAX)
-  {
-    cout << _("Error: Invalid Value for max_connect_errors");
-    exit(-1);
-  }
-  max_connect_errors= in_max_connect_errors;
-}
-
 static void check_limits_max_err_cnt(uint64_t in_max_error_count)
 {
   global_system_variables.max_error_count= DEFAULT_ERROR_COUNT;
@@ -1267,9 +1255,6 @@
   _("A global cap on the amount of memory that can be allocated by session join buffers (0 means unlimited)"))
   ("max-allowed-packet", po::value<uint32_t>(&global_system_variables.max_allowed_packet)->default_value(64*1024*1024L)->notifier(&check_limits_map),
   _("Max packetlength to send/receive from to server."))
-  ("max-connect-errors", po::value<uint64_t>(&max_connect_errors)->default_value(MAX_CONNECT_ERRORS)->notifier(&check_limits_mce),
-  _("If there is more than this number of interrupted connections from a "
-     "host this host will be blocked from further connections."))
   ("max-error-count", po::value<uint64_t>(&global_system_variables.max_error_count)->default_value(DEFAULT_ERROR_COUNT)->notifier(&check_limits_max_err_cnt),
   _("Max number of errors/warnings to store for a statement."))
   ("max-heap-table-size", po::value<uint64_t>(&global_system_variables.max_heap_table_size)->default_value(16*1024*1024L)->notifier(&check_limits_mhts),
@@ -1703,7 +1688,6 @@
   OPT_BACK_LOG,
   OPT_JOIN_BUFF_SIZE,
   OPT_MAX_ALLOWED_PACKET,
-  OPT_MAX_CONNECT_ERRORS,
   OPT_MAX_HEP_TABLE_SIZE,
   OPT_MAX_JOIN_SIZE,
   OPT_MAX_SORT_LENGTH,
@@ -1882,11 +1866,6 @@
    (char**) &global_system_variables.max_allowed_packet,
    (char**) &max_system_variables.max_allowed_packet, 0, GET_UINT32,
    REQUIRED_ARG, 64*1024*1024L, 1024, 1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
-  {"max_connect_errors", OPT_MAX_CONNECT_ERRORS,
-   N_("If there is more than this number of interrupted connections from a "
-      "host this host will be blocked from further connections."),
-   (char**) &max_connect_errors, (char**) &max_connect_errors, 0, GET_UINT64,
-   REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ULONG_MAX, 0, 1, 0},
   {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,
    N_("Don't allow creation of heap tables bigger than this."),
    (char**) &global_system_variables.max_heap_table_size,
 
=== modified file 'drizzled/sys_var.cc'
--- drizzled/sys_var.cc	2011-01-11 06:07:55 +0000
+++ drizzled/sys_var.cc	2011-01-16 11:24:59 +0000
@@ -149,8 +149,6 @@
                                                      &drizzle_system_variables::join_buff_size);
 static sys_var_session_uint32_t	sys_max_allowed_packet("max_allowed_packet",
                                                        &drizzle_system_variables::max_allowed_packet);
-static sys_var_uint64_t_ptr	sys_max_connect_errors("max_connect_errors",
-                                               &max_connect_errors);
 static sys_var_session_uint64_t	sys_max_error_count("max_error_count",
                                                   &drizzle_system_variables::max_error_count);
 static sys_var_session_uint64_t	sys_max_heap_table_size("max_heap_table_size",
@@ -1548,7 +1546,6 @@
     add_sys_var_to_list(&sys_last_insert_id, my_long_options);
     add_sys_var_to_list(&sys_lc_time_names, my_long_options);
     add_sys_var_to_list(&sys_max_allowed_packet, my_long_options);
-    add_sys_var_to_list(&sys_max_connect_errors, my_long_options);
     add_sys_var_to_list(&sys_max_error_count, my_long_options);
     add_sys_var_to_list(&sys_max_heap_table_size, my_long_options);
     add_sys_var_to_list(&sys_max_join_size, my_long_options);
 
=== modified file 'drizzled/sys_var.h'
--- drizzled/sys_var.h	2011-01-11 06:07:55 +0000
+++ drizzled/sys_var.h	2011-01-16 11:24:59 +0000
@@ -65,7 +65,6 @@
 extern uint64_t session_startup_options;
 extern uint32_t global_thread_id;
 extern uint64_t table_cache_size;
-extern uint64_t max_connect_errors;
 extern back_log_constraints back_log;
 extern uint32_t ha_open_options;
 extern char *drizzled_bind_host;
 
=== modified file 'tests/r/variables.result'
--- tests/r/variables.result	2010-12-03 23:18:06 +0000
+++ tests/r/variables.result	2011-01-16 11:24:59 +0000
@@ -1,5 +1,4 @@
 drop table if exists t1,t2;
-set @my_max_connect_errors        =@@global.max_connect_errors;
 set @my_max_heap_table_size       =@@global.max_heap_table_size;
 set @my_max_join_size             =@@global.max_join_size;
 set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
@@ -286,7 +285,6 @@
 set max_allowed_packet=100;
 Warnings:
 Error	1292	Truncated incorrect max_allowed_packet value: '100'
-set global max_connect_errors=100;
 set max_heap_table_size=100;
 Warnings:
 Error	1292	Truncated incorrect max_heap_table_size value: '100'
@@ -533,7 +531,6 @@
 End of 5.0 tests
 set global flush_time                =@my_flush_time;
 ERROR HY000: Unknown system variable 'flush_time'
-set global max_connect_errors        =@my_max_connect_errors;
 set global max_heap_table_size       =@my_max_heap_table_size;
 set global max_join_size             =@my_max_join_size;
 set global max_write_lock_count      =default;
@@ -552,7 +549,6 @@
 set GLOBAL bulk_insert_buffer_size=DEFAULT;
 set GLOBAL join_buffer_size=DEFAULT;
 set GLOBAL max_allowed_packet=DEFAULT;
-set GLOBAL max_connect_errors=DEFAULT;
 set GLOBAL max_heap_table_size=DEFAULT;
 set GLOBAL max_join_size=DEFAULT;
 set GLOBAL max_sort_length=DEFAULT;
 
=== modified file 'tests/t/variables.test'
--- tests/t/variables.test	2010-08-26 21:56:15 +0000
+++ tests/t/variables.test	2011-01-16 11:24:59 +0000
@@ -8,7 +8,6 @@
 #
 # Bug #19263: variables.test doesn't clean up after itself (I/II -- save)
 #
-set @my_max_connect_errors        =@@global.max_connect_errors;
 set @my_max_heap_table_size       =@@global.max_heap_table_size;
 set @my_max_join_size             =@@global.max_join_size;
 set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
@@ -173,7 +172,6 @@
 set join_buffer_size=100;
 set last_insert_id=1;
 set max_allowed_packet=100;
-set global max_connect_errors=100;
 set max_heap_table_size=100;
 set max_join_size=100;
 set max_sort_length=100;
@@ -467,7 +465,6 @@
 #
 --error ER_UNKNOWN_SYSTEM_VARIABLE
 set global flush_time                =@my_flush_time;
-set global max_connect_errors        =@my_max_connect_errors;
 set global max_heap_table_size       =@my_max_heap_table_size;
 set global max_join_size             =@my_max_join_size;
 # No default
@@ -485,7 +482,6 @@
 set GLOBAL bulk_insert_buffer_size=DEFAULT;
 set GLOBAL join_buffer_size=DEFAULT;
 set GLOBAL max_allowed_packet=DEFAULT;
-set GLOBAL max_connect_errors=DEFAULT;
 set GLOBAL max_heap_table_size=DEFAULT;
 set GLOBAL max_join_size=DEFAULT;
 set GLOBAL max_sort_length=DEFAULT;