Merge lp:~percona-dev/percona-server/5.5.10-test-text-changes into lp:~percona-dev/percona-server/5.5.10
- 5.5.10-test-text-changes
- Merge into 5.5.10
Proposed by
Ignacio Nin
Status: | Merged |
---|---|
Approved by: | Vadim Tkachenko |
Approved revision: | no longer in the source branch. |
Merged at revision: | 92 |
Proposed branch: | lp:~percona-dev/percona-server/5.5.10-test-text-changes |
Merge into: | lp:~percona-dev/percona-server/5.5.10 |
Diff against target: |
642 lines (+204/-229) 1 file modified
mysql-test.diff (+204/-229) |
To merge this branch: | bzr merge lp:~percona-dev/percona-server/5.5.10-test-text-changes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vadim Tkachenko | Approve | ||
Review via email: mp+55166@code.launchpad.net |
Commit message
Description of the change
Fixed two failing test which failed due to simple text changes in the results.
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 'mysql-test.diff' |
2 | --- mysql-test.diff 2011-03-23 22:17:40 +0000 |
3 | +++ mysql-test.diff 2011-03-28 15:24:30 +0000 |
4 | @@ -1,13 +1,5 @@ |
5 | -# name : mysql-test.diff |
6 | -# introduced : ??? |
7 | -# maintainer : ??? |
8 | -# |
9 | -#!!! notice !!! |
10 | -# Any small change to this file in the main branch |
11 | -# should be done or reviewed by the maintainer! |
12 | -diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf |
13 | ---- a/mysql-test/include/default_mysqld.cnf 2010-11-03 07:01:11.000000000 +0900 |
14 | -+++ b/mysql-test/include/default_mysqld.cnf 2010-12-10 16:48:10.996387047 +0900 |
15 | +--- a/mysql-test/include/default_mysqld.cnf 2011-03-09 07:11:38.000000000 -0800 |
16 | ++++ b/mysql-test/include/default_mysqld.cnf 2011-03-27 12:51:04.000000000 -0700 |
17 | @@ -29,7 +29,7 @@ |
18 | max_heap_table_size= 1M |
19 | |
20 | @@ -17,9 +9,8 @@ |
21 | loose-innodb_write_io_threads= 2 |
22 | loose-innodb_read_io_threads= 2 |
23 | loose-innodb_log_buffer_size= 1M |
24 | -diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result |
25 | ---- a/mysql-test/r/connect.result 2010-11-03 07:01:12.000000000 +0900 |
26 | -+++ b/mysql-test/r/connect.result 2010-12-10 16:48:10.997386982 +0900 |
27 | +--- a/mysql-test/r/connect.result 2011-03-09 07:11:39.000000000 -0800 |
28 | ++++ b/mysql-test/r/connect.result 2011-03-27 12:51:04.000000000 -0700 |
29 | @@ -1,3 +1,4 @@ |
30 | +set global log_warnings=0; |
31 | drop table if exists t1,t2; |
32 | @@ -30,9 +21,8 @@ |
33 | # -- End of 5.1 tests |
34 | # ------------------------------------------------------------------ |
35 | +set global log_warnings=1; |
36 | -diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result |
37 | ---- a/mysql-test/r/create.result 2010-11-03 07:01:12.000000000 +0900 |
38 | -+++ b/mysql-test/r/create.result 2010-12-10 16:48:11.001009442 +0900 |
39 | +--- a/mysql-test/r/create.result 2011-03-09 07:11:39.000000000 -0800 |
40 | ++++ b/mysql-test/r/create.result 2011-03-27 12:51:04.000000000 -0700 |
41 | @@ -1741,7 +1741,11 @@ |
42 | `COMMAND` varchar(16) NOT NULL DEFAULT '', |
43 | `TIME` int(7) NOT NULL DEFAULT '0', |
44 | @@ -59,9 +49,8 @@ |
45 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8 |
46 | drop table t1; |
47 | create table t1 like information_schema.character_sets; |
48 | -diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result |
49 | ---- a/mysql-test/r/information_schema.result 2010-12-03 20:58:24.000000000 +0300 |
50 | -+++ b/mysql-test/r/information_schema.result 2011-01-10 23:02:09.000000000 +0300 |
51 | +--- a/mysql-test/r/information_schema.result 2011-03-09 07:11:39.000000000 -0800 |
52 | ++++ b/mysql-test/r/information_schema.result 2011-03-27 12:51:04.000000000 -0700 |
53 | @@ -46,14 +46,17 @@ |
54 | select * from v1; |
55 | c |
56 | @@ -273,9 +262,8 @@ |
57 | VIEWS information_schema.VIEWS 1 |
58 | create table t1(f1 int); |
59 | create view v1 as select f1+1 as a from t1; |
60 | -diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result |
61 | ---- a/mysql-test/r/information_schema_db.result 2010-12-03 20:58:24.000000000 +0300 |
62 | -+++ b/mysql-test/r/information_schema_db.result 2011-01-10 23:06:43.000000000 +0300 |
63 | +--- a/mysql-test/r/information_schema_db.result 2011-03-09 07:11:39.000000000 -0800 |
64 | ++++ b/mysql-test/r/information_schema_db.result 2011-03-27 12:51:04.000000000 -0700 |
65 | @@ -6,14 +6,17 @@ |
66 | show tables where Tables_in_information_schema NOT LIKE 'Innodb%'; |
67 | Tables_in_information_schema |
68 | @@ -326,10 +314,9 @@ |
69 | TRIGGERS |
70 | create database `inf%`; |
71 | create database mbase; |
72 | -diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result |
73 | ---- a/mysql-test/r/mysqld--help-notwin.result 2011-01-20 00:37:09.000000000 +0200 |
74 | -+++ b/mysql-test/r/mysqld--help-notwin.result 2011-02-18 13:14:44.701736864 +0200 |
75 | -@@ -250,21 +250,43 @@ |
76 | +--- a/mysql-test/r/mysqld--help-notwin.result 2011-03-09 07:11:39.000000000 -0800 |
77 | ++++ b/mysql-test/r/mysqld--help-notwin.result 2011-03-27 12:52:51.000000000 -0700 |
78 | +@@ -250,21 +250,40 @@ |
79 | --log-slow-admin-statements |
80 | Log slow OPTIMIZE, ANALYZE, ALTER and other |
81 | administrative statements to the slow log if it is open. |
82 | @@ -355,9 +342,6 @@ |
83 | + Log slow statements executed by stored procedure to the |
84 | + slow log if it is open. |
85 | + (Defaults to on; use --skip-log-slow-sp-statements to disable.) |
86 | -+ --log-slow-timestamp-every |
87 | -+ Timestamp is printed for all records of the slow log even |
88 | -+ if they are same time. |
89 | + --log-slow-verbosity=name |
90 | + Choose how verbose the messages to your slow log will be. |
91 | + Multiple flags allowed in a comma-separated string. |
92 | @@ -369,13 +353,13 @@ |
93 | --log-tc-size=# Size of transaction coordinator log. |
94 | -W, --log-warnings[=#] |
95 | Log some not critical warnings to the log file |
96 | -+ --log-warnings-silence=name |
97 | ++ --log-warnings-suppress=name |
98 | + disable logging of enumerated warnings: 1592: unsafe |
99 | + statements for binary logging; possible values : [1592] |
100 | --long-query-time=# Log all queries that have taken more than long_query_time |
101 | seconds to execute to file. The argument will be treated |
102 | as a decimal value with microsecond precision |
103 | -@@ -471,6 +493,10 @@ |
104 | +@@ -471,6 +490,10 @@ |
105 | The minimum size for blocks allocated by the query cache |
106 | --query-cache-size=# |
107 | The memory allocated to store results from old queries |
108 | @@ -386,7 +370,7 @@ |
109 | --query-cache-type=name |
110 | OFF = Don't cache or retrieve results. ON = Cache all |
111 | results except SELECT SQL_NO_CACHE ... queries. DEMAND = |
112 | -@@ -479,6 +505,12 @@ |
113 | +@@ -479,6 +502,12 @@ |
114 | Invalidate queries in query cache on LOCK for write |
115 | --query-prealloc-size=# |
116 | Persistent buffer for query parsing and execution |
117 | @@ -399,37 +383,39 @@ |
118 | --range-alloc-block-size=# |
119 | Allocation block size for storing ranges during |
120 | optimization |
121 | -@@ -656,6 +688,9 @@ |
122 | +@@ -656,6 +685,18 @@ |
123 | Log slow queries to given log file. Defaults logging to |
124 | hostname-slow.log. Must be enabled to activate other slow |
125 | log options |
126 | -+ --slow-query-log-microseconds-timestamp |
127 | ++ --slow-query-log-timestamp-always |
128 | ++ Timestamp is printed for all records of the slow log even |
129 | ++ if they are same time. |
130 | ++ --slow-query-log-timestamp-precision=name |
131 | + Log slow statements executed by stored procedure to the |
132 | -+ slow log if it is open. |
133 | ++ slow log if it is open. [second, microsecond] |
134 | ++ --slow-query-log-use-global-control=name |
135 | ++ Choose flags, wich always use the global variables. |
136 | ++ Multiple flags allowed in a comma-separated string. |
137 | ++ [none, log_slow_filter, log_slow_rate_limit, |
138 | ++ log_slow_verbosity, long_query_time, |
139 | ++ min_examined_row_limit, all] |
140 | --socket=name Socket file to use for connection |
141 | --sort-buffer-size=# |
142 | Each thread that needs to do a sort allocates a buffer of |
143 | -@@ -698,6 +733,8 @@ |
144 | +@@ -698,6 +739,8 @@ |
145 | Define threads usage for handling queries, one of |
146 | one-thread-per-connection, no-threads, loaded-dynamically |
147 | --thread-stack=# The stack size for each thread |
148 | -+ --thread-statistics Control TABLE_STATISTICS running, when userstat_running |
149 | -+ is enabled |
150 | ++ --thread-statistics Control TABLE_STATISTICS running, when userstat is |
151 | ++ enabled |
152 | --time-format=name The TIME format (ignored) |
153 | --timed-mutexes Specify whether to time mutexes (only InnoDB mutexes are |
154 | currently supported) |
155 | -@@ -722,11 +759,24 @@ |
156 | - Prohibit update of a VIEW, which does not contain a key |
157 | +@@ -723,10 +766,17 @@ |
158 | of the underlying table and the query uses a LIMIT clause |
159 | (usually get from GUI tools) |
160 | -+ --use-global-log-slow-control=name |
161 | -+ Choose flags, wich always use the global variables. |
162 | -+ Multiple flags allowed in a comma-separated string. |
163 | -+ [none, log_slow_filter, log_slow_rate_limit, |
164 | -+ log_slow_verbosity, long_query_time, |
165 | -+ min_examined_row_limit, all] |
166 | -u, --user=name Run mysqld daemon as user. |
167 | -+ --userstat-running Control USER_STATISTICS, CLIENT_STATISTICS, |
168 | ++ --userstat Control USER_STATISTICS, CLIENT_STATISTICS, |
169 | + THREAD_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS |
170 | + running |
171 | -v, --verbose Used with --help option for detailed help. |
172 | @@ -443,7 +429,7 @@ |
173 | |
174 | Variables (--variable-name=value) |
175 | abort-slave-event-count 0 |
176 | -@@ -809,10 +859,16 @@ |
177 | +@@ -809,10 +859,15 @@ |
178 | log-short-format FALSE |
179 | log-slave-updates FALSE |
180 | log-slow-admin-statements FALSE |
181 | @@ -451,16 +437,15 @@ |
182 | +log-slow-rate-limit 1 |
183 | log-slow-slave-statements FALSE |
184 | +log-slow-sp-statements TRUE |
185 | -+log-slow-timestamp-every FALSE |
186 | +log-slow-verbosity |
187 | log-tc tc.log |
188 | log-tc-size 24576 |
189 | log-warnings 1 |
190 | -+log-warnings-silence |
191 | ++log-warnings-suppress |
192 | long-query-time 10 |
193 | low-priority-updates FALSE |
194 | lower-case-table-names 1 |
195 | -@@ -887,9 +943,12 @@ |
196 | +@@ -887,9 +942,12 @@ |
197 | query-cache-limit 1048576 |
198 | query-cache-min-res-unit 4096 |
199 | query-cache-size 0 |
200 | @@ -473,15 +458,17 @@ |
201 | range-alloc-block-size 4096 |
202 | read-buffer-size 131072 |
203 | read-only FALSE |
204 | -@@ -924,6 +983,7 @@ |
205 | +@@ -924,6 +982,9 @@ |
206 | slave-type-conversions |
207 | slow-launch-time 2 |
208 | slow-query-log FALSE |
209 | -+slow-query-log-microseconds-timestamp FALSE |
210 | ++slow-query-log-timestamp-always FALSE |
211 | ++slow-query-log-timestamp-precision second |
212 | ++slow-query-log-use-global-control |
213 | sort-buffer-size 2097152 |
214 | sporadic-binlog-dump-fail FALSE |
215 | sql-mode |
216 | -@@ -941,6 +1001,7 @@ |
217 | +@@ -941,6 +1002,7 @@ |
218 | thread-cache-size 0 |
219 | thread-handling one-thread-per-connection |
220 | thread-stack 262144 |
221 | @@ -489,21 +476,19 @@ |
222 | time-format %H:%i:%s |
223 | timed-mutexes FALSE |
224 | tmp-table-size 16777216 |
225 | -@@ -948,8 +1009,11 @@ |
226 | +@@ -948,8 +1010,10 @@ |
227 | transaction-isolation REPEATABLE-READ |
228 | transaction-prealloc-size 4096 |
229 | updatable-views-with-limit YES |
230 | -+use-global-log-slow-control |
231 | -+userstat-running FALSE |
232 | ++userstat FALSE |
233 | verbose TRUE |
234 | wait-timeout 28800 |
235 | +xtradb-admin-command ON |
236 | |
237 | To see what values a running MySQL server is using, type |
238 | 'mysqladmin variables' instead of 'mysqld --verbose --help'. |
239 | -diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result |
240 | ---- a/mysql-test/r/mysqldump.result 2010-11-03 07:01:12.000000000 +0900 |
241 | -+++ b/mysql-test/r/mysqldump.result 2010-12-10 16:48:11.013968901 +0900 |
242 | +--- a/mysql-test/r/mysqldump.result 2011-03-09 07:11:39.000000000 -0800 |
243 | ++++ b/mysql-test/r/mysqldump.result 2011-03-27 12:51:04.000000000 -0700 |
244 | @@ -1832,7 +1832,7 @@ |
245 | # Bug#21288 mysqldump segmentation fault when using --where |
246 | # |
247 | @@ -513,9 +498,8 @@ |
248 | mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server |
249 | |
250 | /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; |
251 | -diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result |
252 | ---- a/mysql-test/r/mysqlshow.result 2010-12-03 20:58:24.000000000 +0300 |
253 | -+++ b/mysql-test/r/mysqlshow.result 2011-01-11 16:41:03.000000000 +0300 |
254 | +--- a/mysql-test/r/mysqlshow.result 2011-03-09 07:11:39.000000000 -0800 |
255 | ++++ b/mysql-test/r/mysqlshow.result 2011-03-27 12:51:04.000000000 -0700 |
256 | @@ -80,14 +80,17 @@ |
257 | | Tables | |
258 | +---------------------------------------+ |
259 | @@ -647,9 +631,8 @@ |
260 | +---------------------------------------+ |
261 | Wildcard: inf_rmation_schema |
262 | +--------------------+ |
263 | -diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result |
264 | ---- a/mysql-test/r/select.result 2010-11-03 07:01:12.000000000 +0900 |
265 | -+++ b/mysql-test/r/select.result 2010-12-10 16:48:11.023052909 +0900 |
266 | +--- a/mysql-test/r/select.result 2011-03-09 07:11:39.000000000 -0800 |
267 | ++++ b/mysql-test/r/select.result 2011-03-27 12:51:04.000000000 -0700 |
268 | @@ -2196,10 +2196,10 @@ |
269 | select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1; |
270 | a a |
271 | @@ -663,9 +646,50 @@ |
272 | 3 3 |
273 | select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1; |
274 | a a |
275 | -diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result |
276 | ---- a/mysql-test/suite/innodb/r/innodb.result 2010-11-03 07:01:12.000000000 +0900 |
277 | -+++ b/mysql-test/suite/innodb/r/innodb.result 2010-12-10 16:48:11.026994635 +0900 |
278 | +--- a/mysql-test/r/show_check.result 2011-03-09 07:11:39.000000000 -0800 |
279 | ++++ b/mysql-test/r/show_check.result 2011-03-27 12:51:04.000000000 -0700 |
280 | +@@ -1537,14 +1537,14 @@ |
281 | + SET NAMES latin1; |
282 | + SELECT GET_LOCK('t',1000) AS 'óóóó';; |
283 | + SHOW PROCESSLIST; |
284 | +-Id User Host db Command Time State Info |
285 | +-### root ### test Query ### ### SHOW PROCESSLIST |
286 | +-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' |
287 | ++Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
288 | ++### root ### test Query ### ### SHOW PROCESSLIST ### ### ### |
289 | ++### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ### |
290 | + SET NAMES utf8; |
291 | + SHOW PROCESSLIST; |
292 | +-Id User Host db Command Time State Info |
293 | +-### root ### test Query ### ### SHOW PROCESSLIST |
294 | +-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' |
295 | ++Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
296 | ++### root ### test Query ### ### SHOW PROCESSLIST ### ### ### |
297 | ++### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ### |
298 | + SELECT RELEASE_LOCK('t'); |
299 | + RELEASE_LOCK('t') |
300 | + 1 |
301 | +--- a/mysql-test/r/sp-threads.result 2011-03-09 07:11:39.000000000 -0800 |
302 | ++++ b/mysql-test/r/sp-threads.result 2011-03-27 12:51:04.000000000 -0700 |
303 | +@@ -33,11 +33,11 @@ |
304 | + lock tables t2 write; |
305 | + call bug9486(); |
306 | + show processlist; |
307 | +-Id User Host db Command Time State Info |
308 | +-# root localhost test Sleep # NULL |
309 | +-# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 |
310 | +-# root localhost test Query # NULL show processlist |
311 | +-# root localhost test Sleep # NULL |
312 | ++Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
313 | ++# root localhost test Sleep # NULL # # # |
314 | ++# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # # # |
315 | ++# root localhost test Query # NULL show processlist # # # |
316 | ++# root localhost test Sleep # NULL # # # |
317 | + unlock tables; |
318 | + drop procedure bug9486; |
319 | + drop table t1, t2; |
320 | +--- a/mysql-test/suite/innodb/r/innodb.result 2011-03-09 07:11:39.000000000 -0800 |
321 | ++++ b/mysql-test/suite/innodb/r/innodb.result 2011-03-27 12:51:04.000000000 -0700 |
322 | @@ -1664,7 +1664,7 @@ |
323 | drop table t1; |
324 | SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; |
325 | @@ -675,112 +699,112 @@ |
326 | SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; |
327 | variable_value |
328 | 16384 |
329 | -diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result |
330 | ---- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-01-20 00:37:09.000000000 +0200 |
331 | -+++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-02-21 02:01:47.873337692 +0200 |
332 | -@@ -11,9 +11,99 @@ |
333 | +--- a/mysql-test/suite/sys_vars/r/all_vars.result 2011-03-09 07:11:39.000000000 -0800 |
334 | ++++ b/mysql-test/suite/sys_vars/r/all_vars.result 2011-03-27 12:54:05.000000000 -0700 |
335 | +@@ -11,9 +11,101 @@ |
336 | select variable_name as `There should be *no* variables listed below:` from t2 |
337 | left join t1 on variable_name=test_name where test_name is null; |
338 | There should be *no* variables listed below: |
339 | -+USE_GLOBAL_LOG_SLOW_CONTROL |
340 | -+LOG_SLOW_SP_STATEMENTS |
341 | -+INNODB_FAST_CHECKSUM |
342 | -+INNODB_THREAD_CONCURRENCY_TIMER_BASED |
343 | -+LOG_SLOW_TIMESTAMP_EVERY |
344 | -+INNODB_SHOW_VERBOSE_LOCKS |
345 | -+INNODB_READ_AHEAD |
346 | -+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT |
347 | -+INNODB_PASS_CORRUPT_TABLE |
348 | -+FAST_INDEX_CREATION |
349 | -+INNODB_FLUSH_NEIGHBOR_PAGES |
350 | -+INNODB_BUFFER_POOL_SHM_CHECKSUM |
351 | -+LOG_SLOW_VERBOSITY |
352 | -+QUERY_RESPONSE_TIME_STATS |
353 | -+QUERY_CACHE_STRIP_COMMENTS |
354 | -+INNODB_SHOW_LOCKS_HELD |
355 | -+INNODB_IBUF_ACCEL_RATE |
356 | -+INNODB_EXPAND_IMPORT |
357 | -+INNODB_CHECKPOINT_AGE_TARGET |
358 | -+LOG_SLOW_SLAVE_STATEMENTS |
359 | -+INNODB_ADAPTIVE_FLUSHING_METHOD |
360 | - INNODB_STATS_METHOD |
361 | -+HAVE_RESPONSE_TIME_DISTRIBUTION |
362 | -+LOG_SLOW_RATE_LIMIT |
363 | -+OPTIMIZER_FIX |
364 | -+INNODB_STATS_AUTO_UPDATE |
365 | -+INNODB_PAGE_SIZE |
366 | -+INNODB_LOG_BLOCK_SIZE |
367 | -+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS |
368 | -+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP |
369 | -+INNODB_BUFFER_POOL_SHM_KEY |
370 | -+INNODB_USE_SYS_STATS_TABLE |
371 | -+INNODB_RECOVERY_STATS |
372 | -+INNODB_DOUBLEWRITE_FILE |
373 | -+INNODB_STATS_UPDATE_NEED_LOCK |
374 | -+USERSTAT_RUNNING |
375 | -+QUERY_RESPONSE_TIME_RANGE_BASE |
376 | -+INNODB_IBUF_ACTIVE_CONTRACT |
377 | -+INNODB_AUTO_LRU_DUMP |
378 | - INNODB_FILE_FORMAT_MAX |
379 | -+INNODB_DICT_SIZE_LIMIT |
380 | -+LOG_WARNINGS_SILENCE |
381 | -+LOG_SLOW_FILTER |
382 | -+INNODB_IBUF_MAX_SIZE |
383 | -+INNODB_OVERWRITE_RELAY_LOG_INFO |
384 | -+INNODB_EXTRA_RSEGMENTS |
385 | -+THREAD_STATISTICS |
386 | -+USE_GLOBAL_LOG_SLOW_CONTROL |
387 | -+LOG_SLOW_SP_STATEMENTS |
388 | -+INNODB_FAST_CHECKSUM |
389 | -+INNODB_THREAD_CONCURRENCY_TIMER_BASED |
390 | -+LOG_SLOW_TIMESTAMP_EVERY |
391 | -+INNODB_SHOW_VERBOSE_LOCKS |
392 | -+INNODB_READ_AHEAD |
393 | -+INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT |
394 | -+INNODB_PASS_CORRUPT_TABLE |
395 | -+FAST_INDEX_CREATION |
396 | -+INNODB_FLUSH_NEIGHBOR_PAGES |
397 | -+INNODB_BUFFER_POOL_SHM_CHECKSUM |
398 | -+LOG_SLOW_VERBOSITY |
399 | -+QUERY_RESPONSE_TIME_STATS |
400 | -+QUERY_CACHE_STRIP_COMMENTS |
401 | -+INNODB_SHOW_LOCKS_HELD |
402 | -+INNODB_IBUF_ACCEL_RATE |
403 | -+INNODB_EXPAND_IMPORT |
404 | -+INNODB_CHECKPOINT_AGE_TARGET |
405 | -+LOG_SLOW_SLAVE_STATEMENTS |
406 | -+INNODB_ADAPTIVE_FLUSHING_METHOD |
407 | - INNODB_STATS_METHOD |
408 | -+HAVE_RESPONSE_TIME_DISTRIBUTION |
409 | -+LOG_SLOW_RATE_LIMIT |
410 | -+OPTIMIZER_FIX |
411 | -+INNODB_STATS_AUTO_UPDATE |
412 | -+INNODB_PAGE_SIZE |
413 | -+INNODB_LOG_BLOCK_SIZE |
414 | -+INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS |
415 | -+SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP |
416 | -+INNODB_BUFFER_POOL_SHM_KEY |
417 | -+INNODB_USE_SYS_STATS_TABLE |
418 | -+INNODB_RECOVERY_STATS |
419 | -+INNODB_DOUBLEWRITE_FILE |
420 | -+INNODB_STATS_UPDATE_NEED_LOCK |
421 | -+USERSTAT_RUNNING |
422 | -+QUERY_RESPONSE_TIME_RANGE_BASE |
423 | -+INNODB_IBUF_ACTIVE_CONTRACT |
424 | -+INNODB_AUTO_LRU_DUMP |
425 | - INNODB_FILE_FORMAT_MAX |
426 | -+INNODB_DICT_SIZE_LIMIT |
427 | -+LOG_WARNINGS_SILENCE |
428 | -+LOG_SLOW_FILTER |
429 | -+INNODB_IBUF_MAX_SIZE |
430 | -+INNODB_OVERWRITE_RELAY_LOG_INFO |
431 | -+INNODB_EXTRA_RSEGMENTS |
432 | -+THREAD_STATISTICS |
433 | ++LOG_SLOW_SP_STATEMENTS |
434 | ++SLOW_QUERY_LOG_TIMESTAMP_PRECISION |
435 | ++THREAD_STATISTICS |
436 | ++SLOW_QUERY_LOG_TIMESTAMP_ALWAYS |
437 | ++INNODB_THREAD_CONCURRENCY_TIMER_BASED |
438 | ++INNODB_LOG_BLOCK_SIZE |
439 | ++INNODB_SHOW_VERBOSE_LOCKS |
440 | ++INNODB_READ_AHEAD |
441 | ++INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT |
442 | ++LOG_WARNINGS_SUPPRESS |
443 | ++FAST_INDEX_CREATION |
444 | ++INNODB_CORRUPT_TABLE_ACTION |
445 | ++INNODB_FLUSH_NEIGHBOR_PAGES |
446 | ++INNODB_LAZY_DROP_TABLE |
447 | ++INNODB_BUFFER_POOL_SHM_CHECKSUM |
448 | ++LOG_SLOW_VERBOSITY |
449 | ++QUERY_RESPONSE_TIME_STATS |
450 | ++QUERY_CACHE_STRIP_COMMENTS |
451 | ++INNODB_SHOW_LOCKS_HELD |
452 | ++INNODB_IBUF_ACCEL_RATE |
453 | ++INNODB_IBUF_MAX_SIZE |
454 | ++INNODB_CHECKPOINT_AGE_TARGET |
455 | ++INNODB_IMPORT_TABLE_FROM_XTRABACKUP |
456 | ++INNODB_ADAPTIVE_FLUSHING_METHOD |
457 | + INNODB_STATS_METHOD |
458 | ++HAVE_RESPONSE_TIME_DISTRIBUTION |
459 | ++INNODB_RECOVERY_UPDATE_RELAY_LOG |
460 | ++OPTIMIZER_FIX |
461 | ++INNODB_BUFFER_POOL_RESTORE_AT_STARTUP |
462 | ++INNODB_PAGE_SIZE |
463 | ++INNODB_FAST_CHECKSUM |
464 | ++SLOW_QUERY_LOG_USE_GLOBAL_CONTROL |
465 | ++INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS |
466 | ++USERSTAT |
467 | ++INNODB_BUFFER_POOL_SHM_KEY |
468 | ++INNODB_USE_SYS_STATS_TABLE |
469 | ++INNODB_RECOVERY_STATS |
470 | ++INNODB_DOUBLEWRITE_FILE |
471 | ++INNODB_STATS_UPDATE_NEED_LOCK |
472 | ++QUERY_RESPONSE_TIME_RANGE_BASE |
473 | ++LOG_SLOW_RATE_LIMIT |
474 | ++INNODB_IBUF_ACTIVE_CONTRACT |
475 | ++INNODB_STATS_AUTO_UPDATE |
476 | ++LOG_SLOW_SLAVE_STATEMENTS |
477 | + INNODB_FILE_FORMAT_MAX |
478 | ++INNODB_DICT_SIZE_LIMIT |
479 | ++LOG_SLOW_FILTER |
480 | ++INNODB_EXTRA_RSEGMENTS |
481 | ++LOG_SLOW_SP_STATEMENTS |
482 | ++SLOW_QUERY_LOG_TIMESTAMP_PRECISION |
483 | ++THREAD_STATISTICS |
484 | ++SLOW_QUERY_LOG_TIMESTAMP_ALWAYS |
485 | ++INNODB_THREAD_CONCURRENCY_TIMER_BASED |
486 | ++INNODB_LOG_BLOCK_SIZE |
487 | ++INNODB_SHOW_VERBOSE_LOCKS |
488 | ++INNODB_READ_AHEAD |
489 | ++INNODB_USE_GLOBAL_FLUSH_LOG_AT_TRX_COMMIT |
490 | ++LOG_WARNINGS_SUPPRESS |
491 | ++FAST_INDEX_CREATION |
492 | ++INNODB_CORRUPT_TABLE_ACTION |
493 | ++INNODB_FLUSH_NEIGHBOR_PAGES |
494 | ++INNODB_LAZY_DROP_TABLE |
495 | ++INNODB_BUFFER_POOL_SHM_CHECKSUM |
496 | ++LOG_SLOW_VERBOSITY |
497 | ++QUERY_RESPONSE_TIME_STATS |
498 | ++QUERY_CACHE_STRIP_COMMENTS |
499 | ++INNODB_SHOW_LOCKS_HELD |
500 | ++INNODB_IBUF_ACCEL_RATE |
501 | ++INNODB_IBUF_MAX_SIZE |
502 | ++INNODB_CHECKPOINT_AGE_TARGET |
503 | ++INNODB_IMPORT_TABLE_FROM_XTRABACKUP |
504 | ++INNODB_ADAPTIVE_FLUSHING_METHOD |
505 | + INNODB_STATS_METHOD |
506 | ++HAVE_RESPONSE_TIME_DISTRIBUTION |
507 | ++INNODB_RECOVERY_UPDATE_RELAY_LOG |
508 | ++OPTIMIZER_FIX |
509 | ++INNODB_BUFFER_POOL_RESTORE_AT_STARTUP |
510 | ++INNODB_PAGE_SIZE |
511 | ++INNODB_FAST_CHECKSUM |
512 | ++SLOW_QUERY_LOG_USE_GLOBAL_CONTROL |
513 | ++INNODB_ADAPTIVE_HASH_INDEX_PARTITIONS |
514 | ++USERSTAT |
515 | ++INNODB_BUFFER_POOL_SHM_KEY |
516 | ++INNODB_USE_SYS_STATS_TABLE |
517 | ++INNODB_RECOVERY_STATS |
518 | ++INNODB_DOUBLEWRITE_FILE |
519 | ++INNODB_STATS_UPDATE_NEED_LOCK |
520 | ++QUERY_RESPONSE_TIME_RANGE_BASE |
521 | ++LOG_SLOW_RATE_LIMIT |
522 | ++INNODB_IBUF_ACTIVE_CONTRACT |
523 | ++INNODB_STATS_AUTO_UPDATE |
524 | ++LOG_SLOW_SLAVE_STATEMENTS |
525 | + INNODB_FILE_FORMAT_MAX |
526 | ++INNODB_DICT_SIZE_LIMIT |
527 | ++LOG_SLOW_FILTER |
528 | ++INNODB_EXTRA_RSEGMENTS |
529 | drop table t1; |
530 | drop table t2; |
531 | -diff -ruN a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result |
532 | ---- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-01-20 07:37:09.000000000 +0900 |
533 | -+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-02-22 19:02:33.970779775 +0900 |
534 | +--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-03-09 07:11:39.000000000 -0800 |
535 | ++++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-03-27 12:51:04.000000000 -0700 |
536 | @@ -10,7 +10,6 @@ |
537 | 1 |
538 | '#---------------------FN_DYNVARS_046_02-------------------------#' |
539 | @@ -789,9 +813,8 @@ |
540 | SELECT @@innodb_flush_log_at_trx_commit; |
541 | @@innodb_flush_log_at_trx_commit |
542 | 1 |
543 | -diff -ruN a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result |
544 | ---- a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-11-03 07:01:13.000000000 +0900 |
545 | -+++ b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2010-12-10 16:48:11.033057415 +0900 |
546 | +--- a/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2011-03-09 07:11:39.000000000 -0800 |
547 | ++++ b/mysql-test/suite/sys_vars/r/plugin_dir_basic.result 2011-03-27 12:51:04.000000000 -0700 |
548 | @@ -1,20 +1,20 @@ |
549 | select @@global.plugin_dir; |
550 | @@global.plugin_dir |
551 | @@ -818,9 +841,8 @@ |
552 | set global plugin_dir=1; |
553 | ERROR HY000: Variable 'plugin_dir' is a read only variable |
554 | set session plugin_dir=1; |
555 | -diff -ruN a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test |
556 | ---- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-01-20 07:37:09.000000000 +0900 |
557 | -+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-02-22 19:03:02.490792783 +0900 |
558 | +--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-03-09 07:11:39.000000000 -0800 |
559 | ++++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-03-27 12:51:04.000000000 -0700 |
560 | @@ -56,7 +56,7 @@ |
561 | # Check if variable can be accessed with and without @@ sign # |
562 | ############################################################################### |
563 | @@ -830,9 +852,8 @@ |
564 | SET innodb_flush_log_at_trx_commit = 1; |
565 | SELECT @@innodb_flush_log_at_trx_commit; |
566 | |
567 | -diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test |
568 | ---- a/mysql-test/t/connect.test 2010-11-03 07:01:12.000000000 +0900 |
569 | -+++ b/mysql-test/t/connect.test 2010-12-10 16:48:11.034065111 +0900 |
570 | +--- a/mysql-test/t/connect.test 2011-03-09 07:11:39.000000000 -0800 |
571 | ++++ b/mysql-test/t/connect.test 2011-03-27 12:51:04.000000000 -0700 |
572 | @@ -1,3 +1,5 @@ |
573 | +set global log_warnings=0; |
574 | + |
575 | @@ -844,53 +865,8 @@ |
576 | --source include/wait_until_count_sessions.inc |
577 | |
578 | +set global log_warnings=1; |
579 | -diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result |
580 | ---- a/mysql-test/r/show_check.result 2011-01-20 00:37:09.000000000 +0200 |
581 | -+++ b/mysql-test/r/show_check.result 2011-03-09 13:05:40.506397491 +0200 |
582 | -@@ -1537,14 +1537,14 @@ |
583 | - SET NAMES latin1; |
584 | - SELECT GET_LOCK('t',1000) AS 'óóóó';; |
585 | - SHOW PROCESSLIST; |
586 | --Id User Host db Command Time State Info |
587 | --### root ### test Query ### ### SHOW PROCESSLIST |
588 | --### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' |
589 | -+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
590 | -+### root ### test Query ### ### SHOW PROCESSLIST ### ### ### |
591 | -+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ### |
592 | - SET NAMES utf8; |
593 | - SHOW PROCESSLIST; |
594 | --Id User Host db Command Time State Info |
595 | --### root ### test Query ### ### SHOW PROCESSLIST |
596 | --### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' |
597 | -+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
598 | -+### root ### test Query ### ### SHOW PROCESSLIST ### ### ### |
599 | -+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ### |
600 | - SELECT RELEASE_LOCK('t'); |
601 | - RELEASE_LOCK('t') |
602 | - 1 |
603 | -diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result |
604 | ---- a/mysql-test/r/sp-threads.result 2011-01-20 00:37:09.000000000 +0200 |
605 | -+++ b/mysql-test/r/sp-threads.result 2011-03-09 13:05:40.507397405 +0200 |
606 | -@@ -33,11 +33,11 @@ |
607 | - lock tables t2 write; |
608 | - call bug9486(); |
609 | - show processlist; |
610 | --Id User Host db Command Time State Info |
611 | --# root localhost test Sleep # NULL |
612 | --# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 |
613 | --# root localhost test Query # NULL show processlist |
614 | --# root localhost test Sleep # NULL |
615 | -+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read |
616 | -+# root localhost test Sleep # NULL # # # |
617 | -+# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # # # |
618 | -+# root localhost test Query # NULL show processlist # # # |
619 | -+# root localhost test Sleep # NULL # # # |
620 | - unlock tables; |
621 | - drop procedure bug9486; |
622 | - drop table t1, t2; |
623 | -diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test |
624 | ---- a/mysql-test/t/show_check.test 2011-01-20 00:37:09.000000000 +0200 |
625 | -+++ b/mysql-test/t/show_check.test 2011-03-09 13:05:40.500398012 +0200 |
626 | +--- a/mysql-test/t/show_check.test 2011-03-09 07:11:39.000000000 -0800 |
627 | ++++ b/mysql-test/t/show_check.test 2011-03-27 12:51:04.000000000 -0700 |
628 | @@ -1375,10 +1375,10 @@ |
629 | let $wait_timeout= 10; |
630 | let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID(); |
631 | @@ -904,9 +880,8 @@ |
632 | SHOW PROCESSLIST; |
633 | SELECT RELEASE_LOCK('t'); |
634 | --connection con1 |
635 | -diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test |
636 | ---- a/mysql-test/t/sp-threads.test 2011-01-20 00:37:09.000000000 +0200 |
637 | -+++ b/mysql-test/t/sp-threads.test 2011-03-09 13:05:40.501397925 +0200 |
638 | +--- a/mysql-test/t/sp-threads.test 2011-03-09 07:11:39.000000000 -0800 |
639 | ++++ b/mysql-test/t/sp-threads.test 2011-03-27 12:51:04.000000000 -0700 |
640 | @@ -81,7 +81,7 @@ |
641 | connection con2root; |
642 | --sleep 2 |
go