1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
|
diff -r 72d4d4f4d840 mysql-test/innodb-index.result
--- a/mysql-test/innodb-index.result Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb-index.result Sun Jul 05 20:51:52 2009 -0700
@@ -46,13 +46,6 @@
KEY `d2` (`d`),
KEY `b` (`b`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
-alter table t1 add unique index (c), add index (d);
-ERROR HY000: Table 'test.t1#1' already exists
-rename table `t1#1` to `t1#2`;
-alter table t1 add unique index (c), add index (d);
-ERROR HY000: Table 'test.t1#2' already exists
-drop table `t1#2`;
alter table t1 add unique index (c), add index (d);
show create table t1;
Table Create Table
diff -r 72d4d4f4d840 mysql-test/innodb-index.test
--- a/mysql-test/innodb-index.test Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb-index.test Sun Jul 05 20:51:52 2009 -0700
@@ -17,16 +17,6 @@
alter table t1 add index (b);
show create table t1;
-# Check how existing tables interfere with temporary tables.
-CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
-
---error 156
-alter table t1 add unique index (c), add index (d);
-rename table `t1#1` to `t1#2`;
---error 156
-alter table t1 add unique index (c), add index (d);
-drop table `t1#2`;
-
alter table t1 add unique index (c), add index (d);
show create table t1;
explain select * from t1 force index(c) order by c;
diff -r 72d4d4f4d840 mysql-test/innodb_bug34300.test
--- a/mysql-test/innodb_bug34300.test Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb_bug34300.test Sun Jul 05 20:51:52 2009 -0700
@@ -30,3 +30,4 @@
SELECT f4, f8 FROM bug34300;
DROP TABLE bug34300;
+SET @@global.max_allowed_packet=1048576;
diff -r 72d4d4f4d840 mysql-test/innodb_bug36169.result
--- a/mysql-test/innodb_bug36169.result Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb_bug36169.result Sun Jul 05 20:51:52 2009 -0700
@@ -1,2 +1,5 @@
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
SET GLOBAL innodb_file_format='Barracuda';
SET GLOBAL innodb_file_per_table=ON;
diff -r 72d4d4f4d840 mysql-test/innodb_bug36169.test
--- a/mysql-test/innodb_bug36169.test Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb_bug36169.test Sun Jul 05 20:51:52 2009 -0700
@@ -4,6 +4,9 @@
#
-- source include/have_innodb.inc
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
SET GLOBAL innodb_file_format='Barracuda';
SET GLOBAL innodb_file_per_table=ON;
@@ -1153,3 +1156,7 @@
DROP TABLE IF EXISTS table5;
DROP TABLE IF EXISTS table6;
+set global innodb_file_per_table=@old_innodb_file_per_table;
+set global innodb_file_format=@old_innodb_file_format;
+set global innodb_file_format_check=@old_innodb_file_format_check;
+
diff -r 72d4d4f4d840 mysql-test/innodb_bug36172.test
--- a/mysql-test/innodb_bug36172.test Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/innodb_bug36172.test Sun Jul 05 20:51:52 2009 -0700
@@ -13,6 +13,9 @@
-- disable_query_log
-- disable_result_log
+set @old_innodb_file_per_table=@@innodb_file_per_table;
+set @old_innodb_file_format=@@innodb_file_format;
+set @old_innodb_file_format_check=@@innodb_file_format_check;
SET GLOBAL innodb_file_format='Barracuda';
SET GLOBAL innodb_file_per_table=on;
@@ -24,3 +27,7 @@
INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.9055146948, `col21` = 4293243420.5621204000, `col22` = '20511211123705', `col23` = 4289899778.6573381000, `col24` = 4293449279.0540481000, `col25` = 'emphysemic', `col26` = 'dentally', `col27` = '2347406', `col28` = 'eruct', `col30` = 1222, `col31` = 4294372994.9941406000, `col32` = 4291385574.1173744000, `col33` = 'borrowing\'s', `col34` = 'septics', `col35` = 'ratter\'s', `col36` = 'Kaye', `col37` = 'Florentia', `col38` = 'allium', `col39` = 'barkeep', `col40` = '19510407003441', `col41` = 4293559200.4215522000, `col42` = 22482, `col43` = 'decussate', `col44` = 'Brom\'s', `col45` = 'violated', `col46` = 4925506.4635456400, `col47` = 930549, `col48` = '51296066', `col49` = 'voluminously', `col50` = '29306676', `col51` = -88, `col52` = -2153690, `col53` = 4290250202.1464887000, `col54` = 'expropriation', `col55` = 'Aberdeen\'s', `col56` = 20343, `col58` = '19640415171532', `col59` = 'extern', `col60` = 'Ubana', `col61` = 4290487961.8539081000, `col62` = '2147', `col63` = -24271, `col64` = '20750801194548', `col65` = 'Cunaxa\'s', `col66` = 'pasticcio', `col67` = 2795817, `col68` = 'Indore\'s', `col70` = 6864127, `col71` = '1817832', `col72` = '20540506114211', `col73` = '20040101012300', `col74` = 'rationalized', `col75` = '45522', `col76` = 'indene', `col77` = -6964559, `col78` = 4247535.5266884370, `col79` = '20720416124357', `col80` = '2143', `col81` = 4292060102.4466386000, `col82` = 'striving', `col83` = 'boneblack\'s', `col84` = 'redolent', `col85` = 6489697.9009369183, `col86` = 4287473465.9731131000, `col87` = 7726015, `col88` = 'perplexed', `col89` = '17153791', `col90` = 5478587.1108127078, `col91` = 4287091404.7004304000, `col92` = 'Boulez\'s', `col93` = '2931278';
CHECK TABLE table0 EXTENDED;
DROP TABLE table0;
+set global innodb_file_per_table=@old_innodb_file_per_table;
+set global innodb_file_format=@old_innodb_file_format;
+set global innodb_file_format_check=@old_innodb_file_format_check;
+
diff -r 72d4d4f4d840 mysql-test/patches/bug32625.diff
--- a/mysql-test/patches/bug32625.diff Sun Jul 05 20:49:44 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- mysql-test/t/type_bit_innodb.test.orig 2008-10-07 11:32:32.000000000 +0300
-+++ mysql-test/t/type_bit_innodb.test 2008-10-07 11:56:40.000000000 +0300
-@@ -40,6 +40,7 @@
- create table t1 (a bit) engine=innodb;
- insert into t1 values (b'0'), (b'1'), (b'000'), (b'100'), (b'001');
- select hex(a) from t1;
-+--replace_regex /entry '(.*)' for/entry '' for/
- --error ER_DUP_ENTRY
- alter table t1 add unique (a);
- drop table t1;
diff -r 72d4d4f4d840 mysql-test/patches/bug41893.diff
--- a/mysql-test/patches/bug41893.diff Sun Jul 05 20:49:44 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-=== modified file 'mysql-test/r/variables.result'
---- mysql-test/r/variables.result 2008-11-27 10:50:28 +0000
-+++ mysql-test/r/variables.result 2009-01-06 07:33:27 +0000
-@@ -297,14 +297,14 @@
- select ROUND(RAND(),5);
- ROUND(RAND(),5)
- 0.02887
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name Value
- query_alloc_block_size 8192
- query_prealloc_size 8192
- range_alloc_block_size 4096
- transaction_alloc_block_size 8192
- transaction_prealloc_size 4096
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE 8192
- QUERY_PREALLOC_SIZE 8192
-@@ -319,14 +319,14 @@
- select @@query_alloc_block_size;
- @@query_alloc_block_size
- 17408
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name Value
- query_alloc_block_size 17408
- query_prealloc_size 18432
- range_alloc_block_size 16384
- transaction_alloc_block_size 19456
- transaction_prealloc_size 20480
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE 17408
- QUERY_PREALLOC_SIZE 18432
-@@ -336,14 +336,14 @@
- set @@range_alloc_block_size=default;
- set @@query_alloc_block_size=default, @@query_prealloc_size=default;
- set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
--show variables like '%alloc%';
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
- Variable_name Value
- query_alloc_block_size 8192
- query_prealloc_size 8192
- range_alloc_block_size 4096
- transaction_alloc_block_size 8192
- transaction_prealloc_size 4096
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- VARIABLE_NAME VARIABLE_VALUE
- QUERY_ALLOC_BLOCK_SIZE 8192
- QUERY_PREALLOC_SIZE 8192
-
-=== modified file 'mysql-test/t/variables.test'
---- mysql-test/t/variables.test 2008-11-27 10:50:28 +0000
-+++ mysql-test/t/variables.test 2009-01-06 07:28:12 +0000
-@@ -172,21 +172,21 @@
- set @@rand_seed1=10000000,@@rand_seed2=1000000;
- select ROUND(RAND(),5);
-
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- set @@range_alloc_block_size=1024*16;
- set @@query_alloc_block_size=1024*17+2;
- set @@query_prealloc_size=1024*18;
- set @@transaction_alloc_block_size=1024*20-1;
- set @@transaction_prealloc_size=1024*21-1;
- select @@query_alloc_block_size;
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
- set @@range_alloc_block_size=default;
- set @@query_alloc_block_size=default, @@query_prealloc_size=default;
- set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
--show variables like '%alloc%';
--select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
-+show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
-+select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
-
- #
- # Bug #10904 Illegal mix of collations between
-
diff -r 72d4d4f4d840 mysql-test/patches/events_stress.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mysql-test/patches/events_stress.diff Sun Jul 05 20:51:52 2009 -0700
@@ -0,0 +1,33 @@
+--- mysql-test/t/events_stress.test.orig 2009-07-05 10:29:14.000000000 +0000
++++ mysql-test/t/events_stress.test 2009-07-05 10:30:49.000000000 +0000
+@@ -61,6 +61,7 @@
+ }
+ --enable_query_log
+ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
++SET @old_event_scheduler=@@event_scheduler;
+ SET GLOBAL event_scheduler=on;
+ --sleep 2.5
+ DROP DATABASE events_conn1_test2;
+@@ -137,5 +138,5 @@
+ DROP DATABASE events_test;
+
+ # Cleanup
+-SET GLOBAL event_scheduler=off;
++SET GLOBAL event_scheduler=@old_event_scheduler;
+ --source include/check_events_off.inc
+--- mysql-test/r/events_stress.result.orig 2009-07-05 10:54:30.000000000 +0000
++++ mysql-test/r/events_stress.result 2009-07-05 10:54:48.000000000 +0000
+@@ -32,6 +32,7 @@
+ SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
+ COUNT(*)
+ 50
++SET @old_event_scheduler=@@event_scheduler;
+ SET GLOBAL event_scheduler=on;
+ DROP DATABASE events_conn1_test2;
+ SET GLOBAL event_scheduler=off;
+@@ -63,4 +64,4 @@
+ DROP TABLE fill_it2;
+ DROP TABLE fill_it3;
+ DROP DATABASE events_test;
+-SET GLOBAL event_scheduler=off;
++SET GLOBAL event_scheduler=@old_event_scheduler;
diff -r 72d4d4f4d840 mysql-test/patches/information_schema.diff
--- a/mysql-test/patches/information_schema.diff Sun Jul 05 20:49:44 2009 -0700
+++ b/mysql-test/patches/information_schema.diff Sun Jul 05 20:51:52 2009 -0700
@@ -1,20 +1,27 @@
---- mysql-test/r/information_schema.result.orig 2009-01-31 03:38:50.000000000 +0200
-+++ mysql-test/r/information_schema.result 2009-01-31 07:51:58.000000000 +0200
-@@ -71,6 +71,13 @@
+--- mysql-test/r/information_schema.result.orig 2009-06-25 21:33:28.000000000 +0000
++++ mysql-test/r/information_schema.result 2009-06-25 21:33:49.000000000 +0000
+@@ -71,6 +71,20 @@
TRIGGERS
USER_PRIVILEGES
VIEWS
++INNODB_BUFFER_POOL_PAGES_INDEX
++INNODB_RSEG
++INNODB_LOCKS
++INNODB_BUFFER_POOL_PAGES
++XTRADB_ENHANCEMENTS
++INNODB_TRX
++INNODB_INDEX_STATS
++INNODB_LOCK_WAITS
+INNODB_CMP_RESET
-+INNODB_TRX
++INNODB_CMP
+INNODB_CMPMEM_RESET
-+INNODB_LOCK_WAITS
++INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_CMPMEM
-+INNODB_CMP
-+INNODB_LOCKS
++INNODB_TABLE_STATS
columns_priv
db
event
-@@ -799,6 +806,8 @@
+@@ -799,6 +813,8 @@
TABLES UPDATE_TIME datetime
TABLES CHECK_TIME datetime
TRIGGERS CREATED datetime
@@ -23,102 +30,100 @@
event execute_at datetime
event last_executed datetime
event starts datetime
-@@ -852,7 +861,7 @@
+@@ -847,12 +863,15 @@
+ TABLE_CONSTRAINTS TABLE_NAME select
+ TABLE_PRIVILEGES TABLE_NAME select
+ VIEWS TABLE_NAME select
++INNODB_BUFFER_POOL_PAGES_INDEX table_name select
++INNODB_INDEX_STATS table_name select
++INNODB_TABLE_STATS table_name select
+ delete from mysql.user where user='mysqltest_4';
+ delete from mysql.db where user='mysqltest_4';
flush privileges;
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;
table_schema count(*)
-information_schema 28
-+information_schema 35
++information_schema 42
mysql 22
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
-@@ -1267,6 +1276,13 @@
+@@ -1267,6 +1286,20 @@
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
VIEWS TABLE_SCHEMA
++INNODB_BUFFER_POOL_PAGES_INDEX schema_name
++INNODB_RSEG rseg_id
++INNODB_LOCKS lock_id
++INNODB_BUFFER_POOL_PAGES page_type
++XTRADB_ENHANCEMENTS name
++INNODB_TRX trx_id
++INNODB_INDEX_STATS table_name
++INNODB_LOCK_WAITS requesting_trx_id
+INNODB_CMP_RESET page_size
-+INNODB_TRX trx_id
++INNODB_CMP page_size
+INNODB_CMPMEM_RESET page_size
-+INNODB_LOCK_WAITS requesting_trx_id
++INNODB_BUFFER_POOL_PAGES_BLOB space_id
+INNODB_CMPMEM page_size
-+INNODB_CMP page_size
-+INNODB_LOCKS lock_id
++INNODB_TABLE_STATS table_name
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
-@@ -1310,6 +1326,13 @@
+@@ -1310,14 +1343,28 @@
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
VIEWS TABLE_SCHEMA
++INNODB_BUFFER_POOL_PAGES_INDEX schema_name
++INNODB_RSEG rseg_id
++INNODB_LOCKS lock_id
++INNODB_BUFFER_POOL_PAGES page_type
++XTRADB_ENHANCEMENTS name
++INNODB_TRX trx_id
++INNODB_INDEX_STATS table_name
++INNODB_LOCK_WAITS requesting_trx_id
+INNODB_CMP_RESET page_size
-+INNODB_TRX trx_id
++INNODB_CMP page_size
+INNODB_CMPMEM_RESET page_size
-+INNODB_LOCK_WAITS requesting_trx_id
++INNODB_BUFFER_POOL_PAGES_BLOB space_id
+INNODB_CMPMEM page_size
-+INNODB_CMP page_size
-+INNODB_LOCKS lock_id
++INNODB_TABLE_STATS table_name
SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
MAX(table_name)
- VIEWS
-@@ -1386,6 +1409,13 @@
+-VIEWS
++XTRADB_ENHANCEMENTS
+ SELECT table_name from information_schema.tables
+ WHERE table_name=(SELECT MAX(table_name)
+ FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
+ table_name
+-VIEWS
++XTRADB_ENHANCEMENTS
+ DROP TABLE IF EXISTS bug23037;
+ DROP FUNCTION IF EXISTS get_value;
+ SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
+@@ -1386,6 +1433,19 @@
FILES information_schema.FILES 1
GLOBAL_STATUS information_schema.GLOBAL_STATUS 1
GLOBAL_VARIABLES information_schema.GLOBAL_VARIABLES 1
++INNODB_BUFFER_POOL_PAGES information_schema.INNODB_BUFFER_POOL_PAGES 1
++INNODB_BUFFER_POOL_PAGES_BLOB information_schema.INNODB_BUFFER_POOL_PAGES_BLOB 1
++INNODB_BUFFER_POOL_PAGES_INDEX information_schema.INNODB_BUFFER_POOL_PAGES_INDEX 1
+INNODB_CMP information_schema.INNODB_CMP 1
+INNODB_CMPMEM information_schema.INNODB_CMPMEM 1
+INNODB_CMPMEM_RESET information_schema.INNODB_CMPMEM_RESET 1
+INNODB_CMP_RESET information_schema.INNODB_CMP_RESET 1
++INNODB_INDEX_STATS information_schema.INNODB_INDEX_STATS 1
+INNODB_LOCKS information_schema.INNODB_LOCKS 1
+INNODB_LOCK_WAITS information_schema.INNODB_LOCK_WAITS 1
++INNODB_RSEG information_schema.INNODB_RSEG 1
++INNODB_TABLE_STATS information_schema.INNODB_TABLE_STATS 1
+INNODB_TRX information_schema.INNODB_TRX 1
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PARTITIONS information_schema.PARTITIONS 1
PLUGINS information_schema.PLUGINS 1
-diff mysql-test/r/information_schema_db.result.orig mysql-test/r/information_schema_db.result
---- mysql-test/r/information_schema_db.result.orig 2008-08-04 09:27:49.000000000 +0300
-+++ mysql-test/r/information_schema_db.result 2008-10-07 12:26:31.000000000 +0300
-@@ -33,6 +33,13 @@
- TRIGGERS
- USER_PRIVILEGES
- VIEWS
-+INNODB_CMP_RESET
-+INNODB_TRX
-+INNODB_CMPMEM_RESET
-+INNODB_LOCK_WAITS
-+INNODB_CMPMEM
-+INNODB_CMP
-+INNODB_LOCKS
- show tables from INFORMATION_SCHEMA like 'T%';
- Tables_in_information_schema (T%)
- TABLES
-diff mysql-test/r/mysqlshow.result.orig mysql-test/r/mysqlshow.result
---- mysql-test/r/mysqlshow.result.orig 2008-08-04 09:27:51.000000000 +0300
-+++ mysql-test/r/mysqlshow.result 2008-10-07 12:35:39.000000000 +0300
-@@ -107,6 +107,13 @@
- | TRIGGERS |
- | USER_PRIVILEGES |
- | VIEWS |
-+| INNODB_CMP_RESET |
-+| INNODB_TRX |
-+| INNODB_CMPMEM_RESET |
-+| INNODB_LOCK_WAITS |
-+| INNODB_CMPMEM |
-+| INNODB_CMP |
-+| INNODB_LOCKS |
- +---------------------------------------+
- Database: INFORMATION_SCHEMA
- +---------------------------------------+
-@@ -140,6 +147,13 @@
- | TRIGGERS |
- | USER_PRIVILEGES |
- | VIEWS |
-+| INNODB_CMP_RESET |
-+| INNODB_TRX |
-+| INNODB_CMPMEM_RESET |
-+| INNODB_LOCK_WAITS |
-+| INNODB_CMPMEM |
-+| INNODB_CMP |
-+| INNODB_LOCKS |
- +---------------------------------------+
- Wildcard: inf_rmation_schema
- +--------------------+
+@@ -1404,6 +1464,7 @@
+ TRIGGERS information_schema.TRIGGERS 1
+ USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
+ VIEWS information_schema.VIEWS 1
++XTRADB_ENHANCEMENTS information_schema.XTRADB_ENHANCEMENTS 1
+ create table t1(f1 int);
+ create view v1 as select f1+1 as a from t1;
+ create table t2 (f1 int, f2 int);
diff -r 72d4d4f4d840 mysql-test/patches/information_schema_db.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mysql-test/patches/information_schema_db.diff Sun Jul 05 20:51:52 2009 -0700
@@ -0,0 +1,23 @@
+--- mysql-test/r/information_schema_db.result.orig 2009-06-25 21:41:38.000000000 +0000
++++ mysql-test/r/information_schema_db.result 2009-06-25 21:42:01.000000000 +0000
+@@ -33,6 +33,20 @@
+ TRIGGERS
+ USER_PRIVILEGES
+ VIEWS
++INNODB_BUFFER_POOL_PAGES_INDEX
++INNODB_RSEG
++INNODB_LOCKS
++INNODB_BUFFER_POOL_PAGES
++XTRADB_ENHANCEMENTS
++INNODB_TRX
++INNODB_INDEX_STATS
++INNODB_LOCK_WAITS
++INNODB_CMP_RESET
++INNODB_CMP
++INNODB_CMPMEM_RESET
++INNODB_BUFFER_POOL_PAGES_BLOB
++INNODB_CMPMEM
++INNODB_TABLE_STATS
+ show tables from INFORMATION_SCHEMA like 'T%';
+ Tables_in_information_schema (T%)
+ TABLES
diff -r 72d4d4f4d840 mysql-test/patches/innodb-index.diff
--- a/mysql-test/patches/innodb-index.diff Sun Jul 05 20:49:44 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-This part of the innodb-index test causes mysqld to print some warnings
-and subsequently the whole mysql-test suite to fail.
-
-A permanent solution is probably to remove the printouts from the source
-code or to somehow tell the mysql-test suite that warnings are expected.
-Currently we simply do not execute the problematic tests. Please
-coordinate a permanent solution with Marko, who added those tests.
-
-This cannot be proposed to MySQL because it touches files that are not
-in the MySQL source repository.
-
-Index: storage/innobase/mysql-test/innodb-index.result
-===================================================================
---- storage/innobase/mysql-test/innodb-index.result (revision 2870)
-+++ storage/innobase/mysql-test/innodb-index.result (working copy)
-@@ -43,19 +43,12 @@ t1 CREATE TABLE `t1` (
- `b` int(11) DEFAULT NULL,
- `c` char(10) NOT NULL,
- `d` varchar(20) DEFAULT NULL,
- KEY `d2` (`d`),
- KEY `b` (`b`)
- ) ENGINE=InnoDB DEFAULT CHARSET=latin1
--CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
--alter table t1 add unique index (c), add index (d);
--ERROR HY000: Table 'test.t1#1' already exists
--rename table `t1#1` to `t1#2`;
--alter table t1 add unique index (c), add index (d);
--ERROR HY000: Table 'test.t1#2' already exists
--drop table `t1#2`;
- alter table t1 add unique index (c), add index (d);
- show create table t1;
- Table Create Table
- t1 CREATE TABLE `t1` (
- `a` int(11) NOT NULL,
- `b` int(11) DEFAULT NULL,
-Index: storage/innobase/mysql-test/innodb-index.test
-===================================================================
---- storage/innobase/mysql-test/innodb-index.test (revision 2870)
-+++ storage/innobase/mysql-test/innodb-index.test (working copy)
-@@ -14,22 +14,12 @@ select * from t1 force index (d2) order
- --error ER_DUP_ENTRY
- alter table t1 add unique index (b);
- show create table t1;
- alter table t1 add index (b);
- show create table t1;
-
--# Check how existing tables interfere with temporary tables.
--CREATE TABLE `t1#1`(a INT PRIMARY KEY) ENGINE=InnoDB;
--
----error 156
--alter table t1 add unique index (c), add index (d);
--rename table `t1#1` to `t1#2`;
----error 156
--alter table t1 add unique index (c), add index (d);
--drop table `t1#2`;
--
- alter table t1 add unique index (c), add index (d);
- show create table t1;
- explain select * from t1 force index(c) order by c;
- alter table t1 add primary key (a), drop index c;
- show create table t1;
- --error ER_MULTIPLE_PRI_KEY
diff -r 72d4d4f4d840 mysql-test/patches/mysqlshow.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mysql-test/patches/mysqlshow.diff Sun Jul 05 20:51:52 2009 -0700
@@ -0,0 +1,44 @@
+--- mysql-test/r/mysqlshow.result.orig 2009-06-25 21:56:22.000000000 +0000
++++ mysql-test/r/mysqlshow.result 2009-06-25 21:56:28.000000000 +0000
+@@ -107,6 +107,20 @@
+ | TRIGGERS |
+ | USER_PRIVILEGES |
+ | VIEWS |
++| INNODB_BUFFER_POOL_PAGES_INDEX |
++| INNODB_RSEG |
++| INNODB_LOCKS |
++| INNODB_BUFFER_POOL_PAGES |
++| XTRADB_ENHANCEMENTS |
++| INNODB_TRX |
++| INNODB_INDEX_STATS |
++| INNODB_LOCK_WAITS |
++| INNODB_CMP_RESET |
++| INNODB_CMP |
++| INNODB_CMPMEM_RESET |
++| INNODB_BUFFER_POOL_PAGES_BLOB |
++| INNODB_CMPMEM |
++| INNODB_TABLE_STATS |
+ +---------------------------------------+
+ Database: INFORMATION_SCHEMA
+ +---------------------------------------+
+@@ -140,6 +154,20 @@
+ | TRIGGERS |
+ | USER_PRIVILEGES |
+ | VIEWS |
++| INNODB_BUFFER_POOL_PAGES_INDEX |
++| INNODB_RSEG |
++| INNODB_LOCKS |
++| INNODB_BUFFER_POOL_PAGES |
++| XTRADB_ENHANCEMENTS |
++| INNODB_TRX |
++| INNODB_INDEX_STATS |
++| INNODB_LOCK_WAITS |
++| INNODB_CMP_RESET |
++| INNODB_CMP |
++| INNODB_CMPMEM_RESET |
++| INNODB_BUFFER_POOL_PAGES_BLOB |
++| INNODB_CMPMEM |
++| INNODB_TABLE_STATS |
+ +---------------------------------------+
+ Wildcard: inf_rmation_schema
+ +--------------------+
diff -Nur a/mysql-test/innodb-analyze.test b/mysql-test/innodb-analyze.test
--- a/mysql-test/innodb-analyze.test 2009-07-05 18:42:05.000000000 +0000
+++ b/mysql-test/innodb-analyze.test 2009-07-05 18:42:48.000000000 +0000
@@ -11,6 +11,7 @@
-- disable_result_log
-- enable_warnings
+SET @old_innodb_stats_sample_pages=@@innodb_stats_sample_pages;
SET GLOBAL innodb_stats_sample_pages=0;
# check that the value has been adjusted to 1
@@ -61,3 +62,4 @@
ANALYZE TABLE innodb_analyze;
DROP TABLE innodb_analyze;
+SET GLOBAL innodb_stats_sample_pages=@old_innodb_stats_sample_pages;
|