~percona-dev/percona-server/release-5.1.51-11-bug_fix_611844

« back to all changes in this revision

Viewing changes to mysql-test.diff

  • Committer: Aleksandr Kuzminsky
  • Date: 2010-10-09 06:15:31 UTC
  • Revision ID: aleksandr.kuzminsky@percona.com-20101009061531-eu06zwg7qi0061u5
mysql-tests are are adjusted for XtraDB version 11

Show diffs side-by-side

added added

removed removed

Lines of Context:
81
81
 select count(*) from t1 where
82
82
 key1a = 2 and key1b is null and key3a = 2 and key3b is null;
83
83
 count(*)
84
 
diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
85
 
--- a/mysql-test/r/information_schema.result    2010-04-06 23:36:46.000000000 +0900
86
 
+++ b/mysql-test/r/information_schema.result    2010-04-30 17:53:05.000000000 +0900
 
84
diff -Nur a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
 
85
--- a/mysql-test/r/information_schema.result    2010-09-17 05:29:07.000000000 -0700
 
86
+++ b/mysql-test/r/information_schema.result    2010-09-17 05:32:43.000000000 -0700
87
87
@@ -44,14 +44,17 @@
88
88
 select * from v1;
89
89
 c
102
102
 GLOBAL_VARIABLES
103
103
 KEY_COLUMN_USAGE
104
104
 PARTITIONS
105
 
@@ -60,6 +63,7 @@
106
 
 PROFILING
107
 
 REFERENTIAL_CONSTRAINTS
108
 
 ROUTINES
109
 
+QUERY_RESPONSE_TIME
110
 
 SCHEMATA
111
 
 SCHEMA_PRIVILEGES
112
 
 SESSION_STATUS
113
 
@@ -68,9 +72,31 @@
 
105
@@ -68,9 +71,31 @@
114
106
 TABLES
115
107
 TABLE_CONSTRAINTS
116
108
 TABLE_PRIVILEGES
142
134
 columns_priv
143
135
 db
144
136
 event
145
 
@@ -106,6 +132,9 @@
146
 
 TABLES TABLES
147
 
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
148
 
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
149
 
+TEMPORARY_TABLES       TEMPORARY_TABLES
150
 
+TABLE_STATISTICS       TABLE_STATISTICS
151
 
+THREAD_STATISTICS      THREAD_STATISTICS
152
 
 TRIGGERS       TRIGGERS
153
 
 tables_priv    tables_priv
154
 
 time_zone      time_zone
155
 
@@ -125,6 +154,9 @@
156
 
 TABLES TABLES
157
 
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
158
 
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
159
 
+TEMPORARY_TABLES       TEMPORARY_TABLES
160
 
+TABLE_STATISTICS       TABLE_STATISTICS
161
 
+THREAD_STATISTICS      THREAD_STATISTICS
162
 
 TRIGGERS       TRIGGERS
163
 
 tables_priv    tables_priv
164
 
 time_zone      time_zone
165
 
@@ -144,6 +176,9 @@
166
 
 TABLES TABLES
167
 
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
168
 
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
169
 
+TEMPORARY_TABLES       TEMPORARY_TABLES
170
 
+TABLE_STATISTICS       TABLE_STATISTICS
171
 
+THREAD_STATISTICS      THREAD_STATISTICS
172
 
 TRIGGERS       TRIGGERS
173
 
 tables_priv    tables_priv
174
 
 time_zone      time_zone
175
 
@@ -625,12 +660,15 @@
 
137
@@ -106,6 +131,9 @@
 
138
 TABLES TABLES
 
139
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
 
140
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
 
141
+TEMPORARY_TABLES       TEMPORARY_TABLES
 
142
+TABLE_STATISTICS       TABLE_STATISTICS
 
143
+THREAD_STATISTICS      THREAD_STATISTICS
 
144
 TRIGGERS       TRIGGERS
 
145
 tables_priv    tables_priv
 
146
 time_zone      time_zone
 
147
@@ -125,6 +153,9 @@
 
148
 TABLES TABLES
 
149
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
 
150
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
 
151
+TEMPORARY_TABLES       TEMPORARY_TABLES
 
152
+TABLE_STATISTICS       TABLE_STATISTICS
 
153
+THREAD_STATISTICS      THREAD_STATISTICS
 
154
 TRIGGERS       TRIGGERS
 
155
 tables_priv    tables_priv
 
156
 time_zone      time_zone
 
157
@@ -144,6 +175,9 @@
 
158
 TABLES TABLES
 
159
 TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
 
160
 TABLE_PRIVILEGES       TABLE_PRIVILEGES
 
161
+TEMPORARY_TABLES       TEMPORARY_TABLES
 
162
+TABLE_STATISTICS       TABLE_STATISTICS
 
163
+THREAD_STATISTICS      THREAD_STATISTICS
 
164
 TRIGGERS       TRIGGERS
 
165
 tables_priv    tables_priv
 
166
 time_zone      time_zone
 
167
@@ -625,12 +659,15 @@
176
168
 where table_schema='information_schema' limit 2;
177
169
 TABLE_NAME     TABLE_TYPE      ENGINE
178
170
 CHARACTER_SETS SYSTEM VIEW     MEMORY
189
181
 TRIGGERS
190
182
 create database information_schema;
191
183
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
192
 
@@ -640,6 +678,9 @@
 
184
@@ -640,6 +677,9 @@
193
185
 TABLES SYSTEM VIEW
194
186
 TABLE_CONSTRAINTS      SYSTEM VIEW
195
187
 TABLE_PRIVILEGES       SYSTEM VIEW
199
191
 TRIGGERS       SYSTEM VIEW
200
192
 create table t1(a int);
201
193
 ERROR 42S02: Unknown table 't1' in information_schema
202
 
@@ -652,6 +693,9 @@
 
194
@@ -652,6 +692,9 @@
203
195
 TABLES
204
196
 TABLE_CONSTRAINTS
205
197
 TABLE_PRIVILEGES
209
201
 TRIGGERS
210
202
 select table_name from tables where table_name='user';
211
203
 table_name
212
 
@@ -790,6 +834,8 @@
 
204
@@ -790,6 +833,8 @@
213
205
 FILES  CREATE_TIME     datetime
214
206
 FILES  UPDATE_TIME     datetime
215
207
 FILES  CHECK_TIME      datetime
218
210
 PARTITIONS     CREATE_TIME     datetime
219
211
 PARTITIONS     UPDATE_TIME     datetime
220
212
 PARTITIONS     CHECK_TIME      datetime
221
 
@@ -798,7 +844,11 @@
 
213
@@ -798,7 +843,11 @@
222
214
 TABLES CREATE_TIME     datetime
223
215
 TABLES UPDATE_TIME     datetime
224
216
 TABLES CHECK_TIME      datetime
230
222
 event  execute_at      datetime
231
223
 event  last_executed   datetime
232
224
 event  starts  datetime
233
 
@@ -838,7 +888,9 @@
 
225
@@ -838,7 +887,9 @@
234
226
 TABLE_NAME     COLUMN_NAME     PRIVILEGES
235
227
 COLUMNS        TABLE_NAME      select
236
228
 COLUMN_PRIVILEGES      TABLE_NAME      select
240
232
 KEY_COLUMN_USAGE       TABLE_NAME      select
241
233
 PARTITIONS     TABLE_NAME      select
242
234
 REFERENTIAL_CONSTRAINTS        TABLE_NAME      select
243
 
@@ -846,13 +898,17 @@
 
235
@@ -846,13 +897,17 @@
244
236
 TABLES TABLE_NAME      select
245
237
 TABLE_CONSTRAINTS      TABLE_NAME      select
246
238
 TABLE_PRIVILEGES       TABLE_NAME      select
255
247
 SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
256
248
 table_schema   count(*)
257
249
-information_schema     28
258
 
+information_schema     54
 
250
+information_schema     53
259
251
 mysql  22
260
252
 create table t1 (i int, j int);
261
253
 create trigger trg1 before insert on t1 for each row
262
 
@@ -1240,14 +1296,17 @@
 
254
@@ -1240,14 +1295,17 @@
263
255
         );
264
256
 table_name     column_name
265
257
 CHARACTER_SETS CHARACTER_SET_NAME
277
269
 GLOBAL_VARIABLES       VARIABLE_NAME
278
270
 KEY_COLUMN_USAGE       CONSTRAINT_SCHEMA
279
271
 PARTITIONS     TABLE_SCHEMA
280
 
@@ -1256,6 +1315,7 @@
281
 
 PROFILING      QUERY_ID
282
 
 REFERENTIAL_CONSTRAINTS        CONSTRAINT_SCHEMA
283
 
 ROUTINES       ROUTINE_SCHEMA
284
 
+QUERY_RESPONSE_TIME    time
285
 
 SCHEMATA       SCHEMA_NAME
286
 
 SCHEMA_PRIVILEGES      TABLE_SCHEMA
287
 
 SESSION_STATUS VARIABLE_NAME
288
 
@@ -1264,9 +1324,31 @@
 
272
@@ -1264,9 +1322,31 @@
289
273
 TABLES TABLE_SCHEMA
290
274
 TABLE_CONSTRAINTS      CONSTRAINT_SCHEMA
291
275
 TABLE_PRIVILEGES       TABLE_SCHEMA
317
301
 SELECT t.table_name, c1.column_name
318
302
 FROM information_schema.tables t
319
303
 INNER JOIN
320
 
@@ -1283,14 +1365,17 @@
 
304
@@ -1283,14 +1363,17 @@
321
305
         );
322
306
 table_name     column_name
323
307
 CHARACTER_SETS CHARACTER_SET_NAME
335
319
 GLOBAL_VARIABLES       VARIABLE_NAME
336
320
 KEY_COLUMN_USAGE       CONSTRAINT_SCHEMA
337
321
 PARTITIONS     TABLE_SCHEMA
338
 
@@ -1299,6 +1384,7 @@
339
 
 PROFILING      QUERY_ID
340
 
 REFERENTIAL_CONSTRAINTS        CONSTRAINT_SCHEMA
341
 
 ROUTINES       ROUTINE_SCHEMA
342
 
+QUERY_RESPONSE_TIME    time
343
 
 SCHEMATA       SCHEMA_NAME
344
 
 SCHEMA_PRIVILEGES      TABLE_SCHEMA
345
 
 SESSION_STATUS VARIABLE_NAME
346
 
@@ -1307,17 +1393,39 @@
 
322
@@ -1307,17 +1390,39 @@
347
323
 TABLES TABLE_SCHEMA
348
324
 TABLE_CONSTRAINTS      CONSTRAINT_SCHEMA
349
325
 TABLE_PRIVILEGES       TABLE_SCHEMA
385
361
 DROP TABLE IF EXISTS bug23037;
386
362
 DROP FUNCTION IF EXISTS get_value;
387
363
 SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
388
 
@@ -1377,6 +1485,7 @@
 
364
@@ -1377,6 +1482,7 @@
389
365
 group by t.table_name order by num1, t.table_name;
390
366
 table_name     group_concat(t.table_schema, '.', t.table_name) num1
391
367
 CHARACTER_SETS information_schema.CHARACTER_SETS       1
393
369
 COLLATIONS     information_schema.COLLATIONS   1
394
370
 COLLATION_CHARACTER_SET_APPLICABILITY  information_schema.COLLATION_CHARACTER_SET_APPLICABILITY        1
395
371
 COLUMNS        information_schema.COLUMNS      1
396
 
@@ -1385,12 +1494,31 @@
 
372
@@ -1385,7 +1491,25 @@
397
373
 EVENTS information_schema.EVENTS       1
398
374
 FILES  information_schema.FILES        1
399
375
 GLOBAL_STATUS  information_schema.GLOBAL_STATUS        1
419
395
 KEY_COLUMN_USAGE       information_schema.KEY_COLUMN_USAGE     1
420
396
 PARTITIONS     information_schema.PARTITIONS   1
421
397
 PLUGINS        information_schema.PLUGINS      1
422
 
 PROCESSLIST    information_schema.PROCESSLIST  1
423
 
 PROFILING      information_schema.PROFILING    1
424
 
+QUERY_RESPONSE_TIME    information_schema.QUERY_RESPONSE_TIME  1
425
 
 REFERENTIAL_CONSTRAINTS        information_schema.REFERENTIAL_CONSTRAINTS      1
426
 
 ROUTINES       information_schema.ROUTINES     1
427
 
 SCHEMATA       information_schema.SCHEMATA     1
428
 
@@ -1401,9 +1529,14 @@
 
398
@@ -1401,9 +1525,14 @@
429
399
 TABLES information_schema.TABLES       1
430
400
 TABLE_CONSTRAINTS      information_schema.TABLE_CONSTRAINTS    1
431
401
 TABLE_PRIVILEGES       information_schema.TABLE_PRIVILEGES     1
461
431
 GLOBAL_VARIABLES
462
432
 KEY_COLUMN_USAGE
463
433
 PARTITIONS
464
 
@@ -22,6 +25,7 @@
465
 
 PROFILING
466
 
 REFERENTIAL_CONSTRAINTS
467
 
 ROUTINES
468
 
+QUERY_RESPONSE_TIME
469
 
 SCHEMATA
470
 
 SCHEMA_PRIVILEGES
471
 
 SESSION_STATUS
472
434
@@ -30,14 +34,39 @@
473
435
 TABLES
474
436
 TABLE_CONSTRAINTS
530
492
 | GLOBAL_VARIABLES                      |
531
493
 | KEY_COLUMN_USAGE                      |
532
494
 | PARTITIONS                            |
533
 
@@ -96,6 +99,7 @@
534
 
 | PROFILING                             |
535
 
 | REFERENTIAL_CONSTRAINTS               |
536
 
 | ROUTINES                              |
537
 
+| QUERY_RESPONSE_TIME                   |
538
 
 | SCHEMATA                              |
539
 
 | SCHEMA_PRIVILEGES                     |
540
 
 | SESSION_STATUS                        |
541
495
@@ -104,23 +108,48 @@
542
496
 | TABLES                                |
543
497
 | TABLE_CONSTRAINTS                     |
587
541
 | GLOBAL_VARIABLES                      |
588
542
 | KEY_COLUMN_USAGE                      |
589
543
 | PARTITIONS                            |
590
 
@@ -129,6 +158,7 @@
591
 
 | PROFILING                             |
592
 
 | REFERENTIAL_CONSTRAINTS               |
593
 
 | ROUTINES                              |
594
 
+| QUERY_RESPONSE_TIME                   |
595
 
 | SCHEMATA                              |
596
 
 | SCHEMA_PRIVILEGES                     |
597
 
 | SESSION_STATUS                        |
598
544
@@ -137,9 +167,31 @@
599
545
 | TABLES                                |
600
546
 | TABLE_CONSTRAINTS                     |
858
804
 #
859
805
 # Bug #34335
860
806
 #
861
 
@@ -674,3 +676,6 @@
862
 
 -- source include/restart_mysqld.inc
 
807
@@ -662,3 +664,6 @@
 
808
 SELECT * FROM t1;
863
809
 SHOW CREATE TABLE t1;
864
810
 DROP TABLE t1;
865
811
+