Drizzle

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

  1. trunk-bug-680872
  2. Merge into 7.0
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 2089
Merged at revision: 2095
Proposed branch: lp:~linuxjedi/drizzle/trunk-bug-680872
Merge into: lp:drizzle/7.0
Diff against target: 174 lines (+0/-34)
6 files modified
drizzled/definitions.h (+0/-1)
drizzled/drizzled.cc (+0/-21)
drizzled/sys_var.cc (+0/-3)
drizzled/sys_var.h (+0/-1)
tests/r/variables.result (+0/-4)
tests/t/variables.test (+0/-4)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/trunk-bug-680872
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+46408@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/definitions.h'
2--- drizzled/definitions.h 2010-12-18 04:43:40 +0000
3+++ drizzled/definitions.h 2011-01-16 11:24:59 +0000
4@@ -197,7 +197,6 @@
5 /* The following can also be changed from the command line */
6 #define DEFAULT_CONCURRENCY 10
7 #define FLUSH_TIME 0 /**< Don't flush tables */
8-#define MAX_CONNECT_ERRORS 10 ///< errors before disabling host
9
10 /* Bits from testflag */
11 enum test_flag_bit
12
13=== modified file 'drizzled/drizzled.cc'
14--- drizzled/drizzled.cc 2011-01-11 07:12:09 +0000
15+++ drizzled/drizzled.cc 2011-01-16 11:24:59 +0000
16@@ -254,7 +254,6 @@
17 uint32_t server_id;
18 uint64_t table_cache_size;
19 size_t table_def_size;
20-uint64_t max_connect_errors;
21 uint32_t global_thread_id= 1UL;
22 pid_t current_pid;
23
24@@ -814,17 +813,6 @@
25 global_system_variables.max_allowed_packet= in_max_allowed_packet;
26 }
27
28-static void check_limits_mce(uint64_t in_max_connect_errors)
29-{
30- max_connect_errors= MAX_CONNECT_ERRORS;
31- if (in_max_connect_errors < 1 || in_max_connect_errors > ULONG_MAX)
32- {
33- cout << _("Error: Invalid Value for max_connect_errors");
34- exit(-1);
35- }
36- max_connect_errors= in_max_connect_errors;
37-}
38-
39 static void check_limits_max_err_cnt(uint64_t in_max_error_count)
40 {
41 global_system_variables.max_error_count= DEFAULT_ERROR_COUNT;
42@@ -1267,9 +1255,6 @@
43 _("A global cap on the amount of memory that can be allocated by session join buffers (0 means unlimited)"))
44 ("max-allowed-packet", po::value<uint32_t>(&global_system_variables.max_allowed_packet)->default_value(64*1024*1024L)->notifier(&check_limits_map),
45 _("Max packetlength to send/receive from to server."))
46- ("max-connect-errors", po::value<uint64_t>(&max_connect_errors)->default_value(MAX_CONNECT_ERRORS)->notifier(&check_limits_mce),
47- _("If there is more than this number of interrupted connections from a "
48- "host this host will be blocked from further connections."))
49 ("max-error-count", po::value<uint64_t>(&global_system_variables.max_error_count)->default_value(DEFAULT_ERROR_COUNT)->notifier(&check_limits_max_err_cnt),
50 _("Max number of errors/warnings to store for a statement."))
51 ("max-heap-table-size", po::value<uint64_t>(&global_system_variables.max_heap_table_size)->default_value(16*1024*1024L)->notifier(&check_limits_mhts),
52@@ -1703,7 +1688,6 @@
53 OPT_BACK_LOG,
54 OPT_JOIN_BUFF_SIZE,
55 OPT_MAX_ALLOWED_PACKET,
56- OPT_MAX_CONNECT_ERRORS,
57 OPT_MAX_HEP_TABLE_SIZE,
58 OPT_MAX_JOIN_SIZE,
59 OPT_MAX_SORT_LENGTH,
60@@ -1882,11 +1866,6 @@
61 (char**) &global_system_variables.max_allowed_packet,
62 (char**) &max_system_variables.max_allowed_packet, 0, GET_UINT32,
63 REQUIRED_ARG, 64*1024*1024L, 1024, 1024L*1024L*1024L, MALLOC_OVERHEAD, 1024, 0},
64- {"max_connect_errors", OPT_MAX_CONNECT_ERRORS,
65- N_("If there is more than this number of interrupted connections from a "
66- "host this host will be blocked from further connections."),
67- (char**) &max_connect_errors, (char**) &max_connect_errors, 0, GET_UINT64,
68- REQUIRED_ARG, MAX_CONNECT_ERRORS, 1, ULONG_MAX, 0, 1, 0},
69 {"max_heap_table_size", OPT_MAX_HEP_TABLE_SIZE,
70 N_("Don't allow creation of heap tables bigger than this."),
71 (char**) &global_system_variables.max_heap_table_size,
72
73=== modified file 'drizzled/sys_var.cc'
74--- drizzled/sys_var.cc 2011-01-11 06:07:55 +0000
75+++ drizzled/sys_var.cc 2011-01-16 11:24:59 +0000
76@@ -149,8 +149,6 @@
77 &drizzle_system_variables::join_buff_size);
78 static sys_var_session_uint32_t sys_max_allowed_packet("max_allowed_packet",
79 &drizzle_system_variables::max_allowed_packet);
80-static sys_var_uint64_t_ptr sys_max_connect_errors("max_connect_errors",
81- &max_connect_errors);
82 static sys_var_session_uint64_t sys_max_error_count("max_error_count",
83 &drizzle_system_variables::max_error_count);
84 static sys_var_session_uint64_t sys_max_heap_table_size("max_heap_table_size",
85@@ -1548,7 +1546,6 @@
86 add_sys_var_to_list(&sys_last_insert_id, my_long_options);
87 add_sys_var_to_list(&sys_lc_time_names, my_long_options);
88 add_sys_var_to_list(&sys_max_allowed_packet, my_long_options);
89- add_sys_var_to_list(&sys_max_connect_errors, my_long_options);
90 add_sys_var_to_list(&sys_max_error_count, my_long_options);
91 add_sys_var_to_list(&sys_max_heap_table_size, my_long_options);
92 add_sys_var_to_list(&sys_max_join_size, my_long_options);
93
94=== modified file 'drizzled/sys_var.h'
95--- drizzled/sys_var.h 2011-01-11 06:07:55 +0000
96+++ drizzled/sys_var.h 2011-01-16 11:24:59 +0000
97@@ -65,7 +65,6 @@
98 extern uint64_t session_startup_options;
99 extern uint32_t global_thread_id;
100 extern uint64_t table_cache_size;
101-extern uint64_t max_connect_errors;
102 extern back_log_constraints back_log;
103 extern uint32_t ha_open_options;
104 extern char *drizzled_bind_host;
105
106=== modified file 'tests/r/variables.result'
107--- tests/r/variables.result 2010-12-03 23:18:06 +0000
108+++ tests/r/variables.result 2011-01-16 11:24:59 +0000
109@@ -1,5 +1,4 @@
110 drop table if exists t1,t2;
111-set @my_max_connect_errors =@@global.max_connect_errors;
112 set @my_max_heap_table_size =@@global.max_heap_table_size;
113 set @my_max_join_size =@@global.max_join_size;
114 set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
115@@ -286,7 +285,6 @@
116 set max_allowed_packet=100;
117 Warnings:
118 Error 1292 Truncated incorrect max_allowed_packet value: '100'
119-set global max_connect_errors=100;
120 set max_heap_table_size=100;
121 Warnings:
122 Error 1292 Truncated incorrect max_heap_table_size value: '100'
123@@ -533,7 +531,6 @@
124 End of 5.0 tests
125 set global flush_time =@my_flush_time;
126 ERROR HY000: Unknown system variable 'flush_time'
127-set global max_connect_errors =@my_max_connect_errors;
128 set global max_heap_table_size =@my_max_heap_table_size;
129 set global max_join_size =@my_max_join_size;
130 set global max_write_lock_count =default;
131@@ -552,7 +549,6 @@
132 set GLOBAL bulk_insert_buffer_size=DEFAULT;
133 set GLOBAL join_buffer_size=DEFAULT;
134 set GLOBAL max_allowed_packet=DEFAULT;
135-set GLOBAL max_connect_errors=DEFAULT;
136 set GLOBAL max_heap_table_size=DEFAULT;
137 set GLOBAL max_join_size=DEFAULT;
138 set GLOBAL max_sort_length=DEFAULT;
139
140=== modified file 'tests/t/variables.test'
141--- tests/t/variables.test 2010-08-26 21:56:15 +0000
142+++ tests/t/variables.test 2011-01-16 11:24:59 +0000
143@@ -8,7 +8,6 @@
144 #
145 # Bug #19263: variables.test doesn't clean up after itself (I/II -- save)
146 #
147-set @my_max_connect_errors =@@global.max_connect_errors;
148 set @my_max_heap_table_size =@@global.max_heap_table_size;
149 set @my_max_join_size =@@global.max_join_size;
150 set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
151@@ -173,7 +172,6 @@
152 set join_buffer_size=100;
153 set last_insert_id=1;
154 set max_allowed_packet=100;
155-set global max_connect_errors=100;
156 set max_heap_table_size=100;
157 set max_join_size=100;
158 set max_sort_length=100;
159@@ -467,7 +465,6 @@
160 #
161 --error ER_UNKNOWN_SYSTEM_VARIABLE
162 set global flush_time =@my_flush_time;
163-set global max_connect_errors =@my_max_connect_errors;
164 set global max_heap_table_size =@my_max_heap_table_size;
165 set global max_join_size =@my_max_join_size;
166 # No default
167@@ -485,7 +482,6 @@
168 set GLOBAL bulk_insert_buffer_size=DEFAULT;
169 set GLOBAL join_buffer_size=DEFAULT;
170 set GLOBAL max_allowed_packet=DEFAULT;
171-set GLOBAL max_connect_errors=DEFAULT;
172 set GLOBAL max_heap_table_size=DEFAULT;
173 set GLOBAL max_join_size=DEFAULT;
174 set GLOBAL max_sort_length=DEFAULT;

Subscribers

People subscribed via source and target branches