]>
Commit | Line | Data |
---|---|---|
d0da6fe5 ER |
1 | --- a/mysql-test/r/information_schema.result 2009-05-07 19:31:26.000000000 +0000 |
2 | +++ b/mysql-test/r/information_schema.result 2009-05-07 19:32:59.000000000 +0000 | |
3 | @@ -60,6 +60,7 @@ | |
4 | USER_STATISTICS | |
5 | VIEWS | |
6 | INNODB_IO_PATTERN | |
7 | +INNODB_RSEG | |
8 | columns_priv | |
9 | db | |
10 | func | |
11 | @@ -743,7 +744,7 @@ | |
12 | CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; | |
13 | CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; | |
14 | count(*) | |
15 | -109 | |
16 | +110 | |
17 | drop view a2, a1; | |
18 | drop table t_crashme; | |
19 | select table_schema,table_name, column_name from | |
20 | @@ -819,7 +820,7 @@ | |
21 | flush privileges; | |
22 | SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; | |
23 | table_schema count(*) | |
24 | -information_schema 24 | |
25 | +information_schema 25 | |
26 | mysql 17 | |
27 | create table t1 (i int, j int); | |
28 | create trigger trg1 before insert on t1 for each row | |
29 | @@ -1228,6 +1229,7 @@ | |
30 | USER_STATISTICS USER | |
31 | VIEWS TABLE_SCHEMA | |
32 | INNODB_IO_PATTERN SPACE | |
33 | +INNODB_RSEG RSEG_ID | |
34 | SELECT t.table_name, c1.column_name | |
35 | FROM information_schema.tables t | |
36 | INNER JOIN | |
37 | @@ -1267,6 +1269,7 @@ | |
38 | USER_STATISTICS USER | |
39 | VIEWS TABLE_SCHEMA | |
40 | INNODB_IO_PATTERN SPACE | |
41 | +INNODB_RSEG RSEG_ID | |
42 | SELECT MAX(table_name) FROM information_schema.tables; | |
43 | MAX(table_name) | |
44 | VIEWS | |
45 | @@ -1342,6 +1345,7 @@ | |
46 | INDEX_STATISTICS information_schema.INDEX_STATISTICS 1 | |
47 | INNODB_BUFFER_POOL_CONTENT information_schema.INNODB_BUFFER_POOL_CONTENT 1 | |
48 | INNODB_IO_PATTERN information_schema.INNODB_IO_PATTERN 1 | |
49 | +INNODB_RSEG information_schema.INNODB_RSEG 1 | |
50 | KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 | |
51 | PROCESSLIST information_schema.PROCESSLIST 1 | |
52 | PROFILING information_schema.PROFILING 1 | |
53 | --- a/mysql-test/r/information_schema_db.result 2009-05-07 19:31:27.000000000 +0000 | |
54 | +++ b/mysql-test/r/information_schema_db.result 2009-05-07 19:35:01.000000000 +0000 | |
55 | @@ -29,6 +29,7 @@ | |
56 | USER_STATISTICS | |
57 | VIEWS | |
58 | INNODB_IO_PATTERN | |
59 | +INNODB_RSEG | |
60 | show tables from INFORMATION_SCHEMA like 'T%'; | |
61 | Tables_in_information_schema (T%) | |
62 | TABLES | |
63 | --- a/mysql-test/r/mysqlshow.result 2009-05-07 19:31:26.000000000 +0000 | |
64 | +++ b/mysql-test/r/mysqlshow.result 2009-05-07 19:36:32.000000000 +0000 | |
65 | @@ -103,6 +103,7 @@ | |
66 | | USER_STATISTICS | | |
67 | | VIEWS | | |
68 | | INNODB_IO_PATTERN | | |
69 | +| INNODB_RSEG | | |
70 | +---------------------------------------+ | |
71 | Database: INFORMATION_SCHEMA | |
72 | +---------------------------------------+ | |
73 | @@ -132,6 +133,7 @@ | |
74 | | USER_STATISTICS | | |
75 | | VIEWS | | |
76 | | INNODB_IO_PATTERN | | |
77 | +| INNODB_RSEG | | |
78 | +---------------------------------------+ | |
79 | Wildcard: inf_rmation_schema | |
80 | +--------------------+ | |
81 | --- a/mysql-test/r/profiling.result 2009-05-28 19:39:42.000000000 +0000 | |
82 | +++ b/mysql-test/r/profiling.result 2009-05-28 19:40:14.000000000 +0000 | |
83 | @@ -6,6 +6,8 @@ | |
84 | Variable_name Value | |
85 | profiling OFF | |
86 | profiling_history_size 15 | |
87 | +profiling_server OFF | |
88 | +profiling_use_getrusage OFF | |
89 | select @@profiling; | |
90 | @@profiling | |
91 | 0 | |
92 | @@ -16,12 +18,16 @@ | |
93 | Variable_name Value | |
94 | profiling OFF | |
95 | profiling_history_size 100 | |
96 | +profiling_server OFF | |
97 | +profiling_use_getrusage OFF | |
98 | set session profiling = ON; | |
99 | set session profiling_history_size=30; | |
100 | show session variables like 'profil%'; | |
101 | Variable_name Value | |
102 | profiling ON | |
103 | profiling_history_size 30 | |
104 | +profiling_server OFF | |
105 | +profiling_use_getrusage OFF | |
106 | select @@profiling; | |
107 | @@profiling | |
108 | 1 |