Merge lp:~percona-dev/percona-server/release-5.1.50-12-bug_fix_658274 into lp:percona-server/release-5.1.50-12
- release-5.1.50-12-bug_fix_658274
- Merge into release-5.1.50-12
Proposed by
Oleg Tsarev
Status: | Merged |
---|---|
Approved by: | Vadim Tkachenko |
Approved revision: | no longer in the source branch. |
Merged at revision: | 129 |
Proposed branch: | lp:~percona-dev/percona-server/release-5.1.50-12-bug_fix_658274 |
Merge into: | lp:percona-server/release-5.1.50-12 |
Diff against target: |
298 lines (+105/-37) 1 file modified
response-time-distribution.patch (+105/-37) |
To merge this branch: | bzr merge lp:~percona-dev/percona-server/release-5.1.50-12-bug_fix_658274 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vadim Tkachenko | Approve | ||
Review via email: mp+38795@code.launchpad.net |
Commit message
Description of the change
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 'response-time-distribution.patch' | |||
2 | --- response-time-distribution.patch 2010-10-19 00:14:36 +0000 | |||
3 | +++ response-time-distribution.patch 2010-10-19 01:28:40 +0000 | |||
4 | @@ -6,8 +6,8 @@ | |||
5 | 6 | # Any small change to this file in the main branch | 6 | # Any small change to this file in the main branch |
6 | 7 | # should be done or reviewed by the maintainer! | 7 | # should be done or reviewed by the maintainer! |
7 | 8 | diff -ruN a/include/mysql_com.h b/include/mysql_com.h | 8 | diff -ruN a/include/mysql_com.h b/include/mysql_com.h |
10 | 9 | --- a/include/mysql_com.h 2010-09-14 20:27:52.000000000 +0000 | 9 | --- a/include/mysql_com.h 2010-10-16 07:28:32.000000000 +0400 |
11 | 10 | +++ b/include/mysql_com.h 2010-09-14 20:31:41.000000000 +0000 | 10 | +++ b/include/mysql_com.h 2010-10-16 07:29:04.000000000 +0400 |
12 | 11 | @@ -128,10 +128,11 @@ | 11 | @@ -128,10 +128,11 @@ |
13 | 12 | #define REFRESH_FAST 32768 /* Intern flag */ | 12 | #define REFRESH_FAST 32768 /* Intern flag */ |
14 | 13 | 13 | ||
15 | @@ -25,8 +25,8 @@ | |||
16 | 25 | #define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */ | 25 | #define CLIENT_LONG_PASSWORD 1 /* new more secure passwords */ |
17 | 26 | #define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */ | 26 | #define CLIENT_FOUND_ROWS 2 /* Found instead of affected rows */ |
18 | 27 | diff -ruN a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info | 27 | diff -ruN a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info |
21 | 28 | --- a/patch_info/response-time-distribution.info 1970-01-01 00:00:00.000000000 +0000 | 28 | --- a/patch_info/response-time-distribution.info 1970-01-01 03:00:00.000000000 +0300 |
22 | 29 | +++ b/patch_info/response-time-distribution.info 2010-09-14 20:31:41.000000000 +0000 | 29 | +++ b/patch_info/response-time-distribution.info 2010-10-16 07:29:04.000000000 +0400 |
23 | 30 | @@ -0,0 +1,9 @@ | 30 | @@ -0,0 +1,9 @@ |
24 | 31 | +File=response-time-distribution.patch | 31 | +File=response-time-distribution.patch |
25 | 32 | +Name=Response time distribution | 32 | +Name=Response time distribution |
26 | @@ -38,8 +38,8 @@ | |||
27 | 38 | +2010-07-02 first version avaliable | 38 | +2010-07-02 first version avaliable |
28 | 39 | +2010-09-15 add column 'total' | 39 | +2010-09-15 add column 'total' |
29 | 40 | diff -ruN a/sql/lex.h b/sql/lex.h | 40 | diff -ruN a/sql/lex.h b/sql/lex.h |
32 | 41 | --- a/sql/lex.h 2010-09-14 20:27:52.000000000 +0000 | 41 | --- a/sql/lex.h 2010-10-16 07:28:35.000000000 +0400 |
33 | 42 | +++ b/sql/lex.h 2010-09-14 20:31:41.000000000 +0000 | 42 | +++ b/sql/lex.h 2010-10-16 07:29:04.000000000 +0400 |
34 | 43 | @@ -415,6 +415,7 @@ | 43 | @@ -415,6 +415,7 @@ |
35 | 44 | { "PURGE", SYM(PURGE)}, | 44 | { "PURGE", SYM(PURGE)}, |
36 | 45 | { "QUARTER", SYM(QUARTER_SYM)}, | 45 | { "QUARTER", SYM(QUARTER_SYM)}, |
37 | @@ -49,8 +49,8 @@ | |||
38 | 49 | { "RANGE", SYM(RANGE_SYM)}, | 49 | { "RANGE", SYM(RANGE_SYM)}, |
39 | 50 | { "READ", SYM(READ_SYM)}, | 50 | { "READ", SYM(READ_SYM)}, |
40 | 51 | diff -ruN a/sql/Makefile.am b/sql/Makefile.am | 51 | diff -ruN a/sql/Makefile.am b/sql/Makefile.am |
43 | 52 | --- a/sql/Makefile.am 2010-09-14 20:27:51.000000000 +0000 | 52 | --- a/sql/Makefile.am 2010-10-16 07:28:31.000000000 +0400 |
44 | 53 | +++ b/sql/Makefile.am 2010-09-14 20:31:41.000000000 +0000 | 53 | +++ b/sql/Makefile.am 2010-10-16 07:29:04.000000000 +0400 |
45 | 54 | @@ -67,7 +67,7 @@ | 54 | @@ -67,7 +67,7 @@ |
46 | 55 | sql_repl.h slave.h rpl_filter.h rpl_injector.h \ | 55 | sql_repl.h slave.h rpl_filter.h rpl_injector.h \ |
47 | 56 | log_event.h rpl_record.h \ | 56 | log_event.h rpl_record.h \ |
48 | @@ -70,8 +70,8 @@ | |||
49 | 70 | sql_profile.cc \ | 70 | sql_profile.cc \ |
50 | 71 | sql_prepare.cc sql_error.cc sql_locale.cc \ | 71 | sql_prepare.cc sql_error.cc sql_locale.cc \ |
51 | 72 | diff -ruN a/sql/Makefile.in b/sql/Makefile.in | 72 | diff -ruN a/sql/Makefile.in b/sql/Makefile.in |
54 | 73 | --- a/sql/Makefile.in 2010-09-14 20:27:51.000000000 +0000 | 73 | --- a/sql/Makefile.in 2010-10-16 07:28:31.000000000 +0400 |
55 | 74 | +++ b/sql/Makefile.in 2010-09-14 20:31:41.000000000 +0000 | 74 | +++ b/sql/Makefile.in 2010-10-16 07:29:04.000000000 +0400 |
56 | 75 | @@ -122,7 +122,7 @@ | 75 | @@ -122,7 +122,7 @@ |
57 | 76 | sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \ | 76 | sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \ |
58 | 77 | mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \ | 77 | mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \ |
59 | @@ -108,8 +108,8 @@ | |||
60 | 108 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@ | 108 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@ |
61 | 109 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@ | 109 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@ |
62 | 110 | diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc | 110 | diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc |
65 | 111 | --- a/sql/mysqld.cc 2010-09-14 20:27:52.000000000 +0000 | 111 | --- a/sql/mysqld.cc 2010-10-16 07:28:35.000000000 +0400 |
66 | 112 | +++ b/sql/mysqld.cc 2010-09-14 20:32:15.000000000 +0000 | 112 | +++ b/sql/mysqld.cc 2010-10-16 07:29:04.000000000 +0400 |
67 | 113 | @@ -32,6 +32,8 @@ | 113 | @@ -32,6 +32,8 @@ |
68 | 114 | 114 | ||
69 | 115 | #include "rpl_injector.h" | 115 | #include "rpl_injector.h" |
70 | @@ -119,7 +119,7 @@ | |||
71 | 119 | #ifdef HAVE_SYS_PRCTL_H | 119 | #ifdef HAVE_SYS_PRCTL_H |
72 | 120 | #include <sys/prctl.h> | 120 | #include <sys/prctl.h> |
73 | 121 | #endif | 121 | #endif |
75 | 122 | @@ -527,6 +533,8 @@ | 122 | @@ -527,6 +529,8 @@ |
76 | 123 | my_bool opt_query_cache_strip_comments = 0; | 123 | my_bool opt_query_cache_strip_comments = 0; |
77 | 124 | my_bool opt_use_global_long_query_time= 0; | 124 | my_bool opt_use_global_long_query_time= 0; |
78 | 125 | my_bool opt_slow_query_log_microseconds_timestamp= 0; | 125 | my_bool opt_slow_query_log_microseconds_timestamp= 0; |
79 | @@ -128,7 +128,7 @@ | |||
80 | 128 | my_bool lower_case_file_system= 0; | 128 | my_bool lower_case_file_system= 0; |
81 | 129 | my_bool opt_large_pages= 0; | 129 | my_bool opt_large_pages= 0; |
82 | 130 | my_bool opt_myisam_use_mmap= 0; | 130 | my_bool opt_myisam_use_mmap= 0; |
84 | 131 | @@ -1382,6 +1395,7 @@ | 131 | @@ -1382,6 +1386,7 @@ |
85 | 132 | free_global_thread_stats(); | 132 | free_global_thread_stats(); |
86 | 133 | free_global_table_stats(); | 133 | free_global_table_stats(); |
87 | 134 | free_global_index_stats(); | 134 | free_global_index_stats(); |
88 | @@ -136,7 +136,7 @@ | |||
89 | 136 | #ifdef HAVE_REPLICATION | 136 | #ifdef HAVE_REPLICATION |
90 | 137 | end_slave_list(); | 137 | end_slave_list(); |
91 | 138 | #endif | 138 | #endif |
93 | 139 | @@ -4082,6 +4096,7 @@ | 139 | @@ -4082,6 +4087,7 @@ |
94 | 140 | 140 | ||
95 | 141 | init_global_table_stats(); | 141 | init_global_table_stats(); |
96 | 142 | init_global_index_stats(); | 142 | init_global_index_stats(); |
97 | @@ -144,7 +144,7 @@ | |||
98 | 144 | 144 | ||
99 | 145 | /* We have to initialize the storage engines before CSV logging */ | 145 | /* We have to initialize the storage engines before CSV logging */ |
100 | 146 | if (ha_init()) | 146 | if (ha_init()) |
102 | 147 | @@ -5895,6 +6003,8 @@ | 147 | @@ -5895,6 +5901,8 @@ |
103 | 148 | OPT_USE_GLOBAL_LONG_QUERY_TIME, | 148 | OPT_USE_GLOBAL_LONG_QUERY_TIME, |
104 | 149 | OPT_USE_GLOBAL_LOG_SLOW_CONTROL, | 149 | OPT_USE_GLOBAL_LOG_SLOW_CONTROL, |
105 | 150 | OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP, | 150 | OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP, |
106 | @@ -153,7 +153,7 @@ | |||
107 | 153 | OPT_IGNORE_BUILTIN_INNODB, | 153 | OPT_IGNORE_BUILTIN_INNODB, |
108 | 154 | OPT_BINLOG_DIRECT_NON_TRANS_UPDATE, | 154 | OPT_BINLOG_DIRECT_NON_TRANS_UPDATE, |
109 | 155 | OPT_DEFAULT_CHARACTER_SET_OLD | 155 | OPT_DEFAULT_CHARACTER_SET_OLD |
111 | 156 | @@ -6964,6 +7074,21 @@ | 156 | @@ -6964,6 +6972,21 @@ |
112 | 157 | "Use microsecond time's precision in slow query log", | 157 | "Use microsecond time's precision in slow query log", |
113 | 158 | (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp, | 158 | (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp, |
114 | 159 | 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0}, | 159 | 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0}, |
115 | @@ -176,8 +176,8 @@ | |||
116 | 176 | "If set to 1, table names are stored in lowercase on disk and table names " | 176 | "If set to 1, table names are stored in lowercase on disk and table names " |
117 | 177 | "will be case-insensitive. Should be set to 2 if you are using a case-" | 177 | "will be case-insensitive. Should be set to 2 if you are using a case-" |
118 | 178 | diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h | 178 | diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h |
121 | 179 | --- a/sql/mysql_priv.h 2010-09-14 20:27:52.000000000 +0000 | 179 | --- a/sql/mysql_priv.h 2010-10-16 07:28:35.000000000 +0400 |
122 | 180 | +++ b/sql/mysql_priv.h 2010-09-14 20:31:41.000000000 +0000 | 180 | +++ b/sql/mysql_priv.h 2010-10-16 07:29:04.000000000 +0400 |
123 | 181 | @@ -2090,6 +2090,8 @@ | 181 | @@ -2090,6 +2090,8 @@ |
124 | 182 | extern my_bool opt_query_cache_strip_comments; | 182 | extern my_bool opt_query_cache_strip_comments; |
125 | 183 | extern my_bool opt_use_global_long_query_time; | 183 | extern my_bool opt_use_global_long_query_time; |
126 | @@ -188,9 +188,9 @@ | |||
127 | 188 | extern my_bool opt_old_style_user_limits, trust_function_creators; | 188 | extern my_bool opt_old_style_user_limits, trust_function_creators; |
128 | 189 | extern uint opt_crash_binlog_innodb; | 189 | extern uint opt_crash_binlog_innodb; |
129 | 190 | diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc | 190 | diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc |
133 | 191 | --- a/sql/query_response_time.cc 1970-01-01 00:00:00.000000000 +0000 | 191 | --- a/sql/query_response_time.cc 1970-01-01 03:00:00.000000000 +0300 |
134 | 192 | +++ b/sql/query_response_time.cc 2010-09-14 20:32:15.000000000 +0000 | 192 | +++ b/sql/query_response_time.cc 2010-10-18 15:23:12.000000000 +0400 |
135 | 193 | @@ -0,0 +1,279 @@ | 193 | @@ -0,0 +1,347 @@ |
136 | 194 | +#include "my_global.h" | 194 | +#include "my_global.h" |
137 | 195 | +#include "mysql_priv.h" | 195 | +#include "mysql_priv.h" |
138 | 196 | +#include "mysql_com.h" | 196 | +#include "mysql_com.h" |
139 | @@ -341,6 +341,74 @@ | |||
140 | 341 | + } | 341 | + } |
141 | 342 | + buffer[result_length]= 0; | 342 | + buffer[result_length]= 0; |
142 | 343 | +} | 343 | +} |
143 | 344 | +#ifdef __x86_64__ | ||
144 | 345 | +typedef uint64 TimeCounter; | ||
145 | 346 | +void add_time_atomic(TimeCounter* counter, uint64 time) | ||
146 | 347 | +{ | ||
147 | 348 | + __sync_fetch_and_add(counter,time); | ||
148 | 349 | +} | ||
149 | 350 | +#endif // __x86_64__ | ||
150 | 351 | +#ifdef __i386__ | ||
151 | 352 | +inline uint32 get_high(uint64 value) | ||
152 | 353 | +{ | ||
153 | 354 | + return ((value >> 32) << 32); | ||
154 | 355 | +} | ||
155 | 356 | +inline uint32 get_low(uint64 value) | ||
156 | 357 | +{ | ||
157 | 358 | + return ((value << 32) >> 32); | ||
158 | 359 | +} | ||
159 | 360 | +class TimeCounter | ||
160 | 361 | +{ | ||
161 | 362 | +public: | ||
162 | 363 | + TimeCounter& operator=(uint64 time) | ||
163 | 364 | + { | ||
164 | 365 | + this->m_high= get_high(time); | ||
165 | 366 | + this->m_low= get_low(time); | ||
166 | 367 | + return *this; | ||
167 | 368 | + } | ||
168 | 369 | + operator uint64() const | ||
169 | 370 | + { | ||
170 | 371 | + return ((static_cast<uint64>(m_high) << 32) + static_cast<uint64>(m_low)); | ||
171 | 372 | + } | ||
172 | 373 | + void add(uint64 time) | ||
173 | 374 | + { | ||
174 | 375 | + uint32 time_high = get_high(time); | ||
175 | 376 | + uint32 time_low = get_low(time); | ||
176 | 377 | + uint64 time_low64= time_low; | ||
177 | 378 | + while(true) | ||
178 | 379 | + { | ||
179 | 380 | + uint32 old_low= this->m_low; | ||
180 | 381 | + uint64 old_low64= old_low; | ||
181 | 382 | + | ||
182 | 383 | + uint64 new_low64= old_low64 + time_low64; | ||
183 | 384 | + uint32 new_low= (get_low(new_low64)); | ||
184 | 385 | + bool add_high= (get_high(new_low64) != 0); | ||
185 | 386 | + | ||
186 | 387 | + if(!__sync_bool_compare_and_swap(&m_low,old_low,new_low)) | ||
187 | 388 | + { | ||
188 | 389 | + continue; | ||
189 | 390 | + } | ||
190 | 391 | + if(add_high) | ||
191 | 392 | + { | ||
192 | 393 | + ++time_high; | ||
193 | 394 | + } | ||
194 | 395 | + if(time_high > 0) | ||
195 | 396 | + { | ||
196 | 397 | + __sync_fetch_and_add(&m_high,time_high); | ||
197 | 398 | + } | ||
198 | 399 | + break; | ||
199 | 400 | + } | ||
200 | 401 | + } | ||
201 | 402 | +private: | ||
202 | 403 | + uint32 m_low; | ||
203 | 404 | + uint32 m_high; | ||
204 | 405 | +}; | ||
205 | 406 | +void add_time_atomic(TimeCounter* counter, uint64 time) | ||
206 | 407 | +{ | ||
207 | 408 | + counter->add(time); | ||
208 | 409 | +} | ||
209 | 410 | +#endif // __i386__ | ||
210 | 411 | + | ||
211 | 344 | +class time_collector | 412 | +class time_collector |
212 | 345 | +{ | 413 | +{ |
213 | 346 | +public: | 414 | +public: |
214 | @@ -363,15 +431,15 @@ | |||
215 | 363 | + if(m_utility->bound(i) > time) | 431 | + if(m_utility->bound(i) > time) |
216 | 364 | + { | 432 | + { |
217 | 365 | + __sync_fetch_and_add(&(m_count[i]),(uint32)1); | 433 | + __sync_fetch_and_add(&(m_count[i]),(uint32)1); |
220 | 366 | + __sync_fetch_and_add(&(m_total[i]),time); | 434 | + add_time_atomic(&(m_total[i]),time); |
221 | 367 | + break; | 435 | + break; |
222 | 368 | + } | 436 | + } |
223 | 369 | + } | 437 | + } |
224 | 370 | + } | 438 | + } |
225 | 371 | +private: | 439 | +private: |
226 | 372 | + utility* m_utility; | 440 | + utility* m_utility; |
227 | 373 | + uint32 m_count[OVERALL_POWER_COUNT + 1]; | 441 | + uint32 m_count[OVERALL_POWER_COUNT + 1]; |
229 | 374 | + uint64 m_total[OVERALL_POWER_COUNT + 1]; | 442 | + TimeCounter m_total[OVERALL_POWER_COUNT + 1]; |
230 | 375 | +}; | 443 | +}; |
231 | 376 | + | 444 | + |
232 | 377 | +class collector | 445 | +class collector |
233 | @@ -471,8 +539,8 @@ | |||
234 | 471 | + return query_response_time::g_collector.fill(thd,tables,cond); | 539 | + return query_response_time::g_collector.fill(thd,tables,cond); |
235 | 472 | +} | 540 | +} |
236 | 473 | diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h | 541 | diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h |
239 | 474 | --- a/sql/query_response_time.h 1970-01-01 00:00:00.000000000 +0000 | 542 | --- a/sql/query_response_time.h 1970-01-01 03:00:00.000000000 +0300 |
240 | 475 | +++ b/sql/query_response_time.h 2010-09-14 20:32:15.000000000 +0000 | 543 | +++ b/sql/query_response_time.h 2010-10-16 07:29:04.000000000 +0400 |
241 | 476 | @@ -0,0 +1,69 @@ | 544 | @@ -0,0 +1,69 @@ |
242 | 477 | +#ifndef QUERY_RESPONSE_TIME_H | 545 | +#ifndef QUERY_RESPONSE_TIME_H |
243 | 478 | +#define QUERY_RESPONSE_TIME_H | 546 | +#define QUERY_RESPONSE_TIME_H |
244 | @@ -544,8 +612,8 @@ | |||
245 | 544 | + | 612 | + |
246 | 545 | +#endif // QUERY_RESPONSE_TIME_H | 613 | +#endif // QUERY_RESPONSE_TIME_H |
247 | 546 | diff -ruN a/sql/set_var.cc b/sql/set_var.cc | 614 | diff -ruN a/sql/set_var.cc b/sql/set_var.cc |
250 | 547 | --- a/sql/set_var.cc 2010-09-14 20:27:52.000000000 +0000 | 615 | --- a/sql/set_var.cc 2010-10-16 07:28:35.000000000 +0400 |
251 | 548 | +++ b/sql/set_var.cc 2010-09-14 20:31:41.000000000 +0000 | 616 | +++ b/sql/set_var.cc 2010-10-16 07:29:04.000000000 +0400 |
252 | 549 | @@ -1004,6 +1004,10 @@ | 617 | @@ -1004,6 +1004,10 @@ |
253 | 550 | static sys_var_use_global_long_query_time sys_use_global_long_query_time; | 618 | static sys_var_use_global_long_query_time sys_use_global_long_query_time; |
254 | 551 | static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp", | 619 | static sys_var_bool_ptr sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp", |
255 | @@ -558,8 +626,8 @@ | |||
256 | 558 | static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries", | 626 | static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries", |
257 | 559 | &opt_slow_log, QUERY_LOG_SLOW); | 627 | &opt_slow_log, QUERY_LOG_SLOW); |
258 | 560 | diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc | 628 | diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc |
261 | 561 | --- a/sql/sql_parse.cc 2010-09-14 20:27:52.000000000 +0000 | 629 | --- a/sql/sql_parse.cc 2010-10-16 07:28:35.000000000 +0400 |
262 | 562 | +++ b/sql/sql_parse.cc 2010-09-14 20:31:41.000000000 +0000 | 630 | +++ b/sql/sql_parse.cc 2010-10-16 07:29:04.000000000 +0400 |
263 | 563 | @@ -27,6 +27,7 @@ | 631 | @@ -27,6 +27,7 @@ |
264 | 564 | #include "sp_cache.h" | 632 | #include "sp_cache.h" |
265 | 565 | #include "events.h" | 633 | #include "events.h" |
266 | @@ -634,8 +702,8 @@ | |||
267 | 634 | { | 702 | { |
268 | 635 | pthread_mutex_lock(&LOCK_global_user_client_stats); | 703 | pthread_mutex_lock(&LOCK_global_user_client_stats); |
269 | 636 | diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc | 704 | diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc |
272 | 637 | --- a/sql/sql_show.cc 2010-09-14 20:27:52.000000000 +0000 | 705 | --- a/sql/sql_show.cc 2010-10-16 07:28:32.000000000 +0400 |
273 | 638 | +++ b/sql/sql_show.cc 2010-09-14 20:32:15.000000000 +0000 | 706 | +++ b/sql/sql_show.cc 2010-10-16 07:29:04.000000000 +0400 |
274 | 639 | @@ -31,6 +31,7 @@ | 707 | @@ -31,6 +31,7 @@ |
275 | 640 | #include "event_data_objects.h" | 708 | #include "event_data_objects.h" |
276 | 641 | #endif | 709 | #endif |
277 | @@ -669,8 +737,8 @@ | |||
278 | 669 | fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0}, | 737 | fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0}, |
279 | 670 | {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table, | 738 | {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table, |
280 | 671 | diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy | 739 | diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy |
283 | 672 | --- a/sql/sql_yacc.yy 2010-09-14 20:27:52.000000000 +0000 | 740 | --- a/sql/sql_yacc.yy 2010-10-16 07:28:35.000000000 +0400 |
284 | 673 | +++ b/sql/sql_yacc.yy 2010-09-14 20:31:41.000000000 +0000 | 741 | +++ b/sql/sql_yacc.yy 2010-10-16 07:29:04.000000000 +0400 |
285 | 674 | @@ -1079,6 +1079,7 @@ | 742 | @@ -1079,6 +1079,7 @@ |
286 | 675 | %token PURGE | 743 | %token PURGE |
287 | 676 | %token QUARTER_SYM | 744 | %token QUARTER_SYM |
288 | @@ -711,8 +779,8 @@ | |||
289 | 711 | | READ_ONLY_SYM {} | 779 | | READ_ONLY_SYM {} |
290 | 712 | | REBUILD_SYM {} | 780 | | REBUILD_SYM {} |
291 | 713 | diff -ruN a/sql/table.h b/sql/table.h | 781 | diff -ruN a/sql/table.h b/sql/table.h |
294 | 714 | --- a/sql/table.h 2010-09-14 20:27:52.000000000 +0000 | 782 | --- a/sql/table.h 2010-10-16 07:28:32.000000000 +0400 |
295 | 715 | +++ b/sql/table.h 2010-09-14 20:31:41.000000000 +0000 | 783 | +++ b/sql/table.h 2010-10-16 07:29:04.000000000 +0400 |
296 | 716 | @@ -963,6 +963,7 @@ | 784 | @@ -963,6 +963,7 @@ |
297 | 717 | SCH_PROFILES, | 785 | SCH_PROFILES, |
298 | 718 | SCH_REFERENTIAL_CONSTRAINTS, | 786 | SCH_REFERENTIAL_CONSTRAINTS, |
ok