← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/mysql-test/patches/information_schema.diff

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mysql-test/patches/information_schema.diff
1
 
--- mysql-test/r/information_schema.result.orig 2009-01-31 03:38:50.000000000 +0200
2
 
+++ mysql-test/r/information_schema.result      2009-01-31 07:51:58.000000000 +0200
3
 
@@ -71,6 +71,13 @@
4
 
 TRIGGERS
5
 
 USER_PRIVILEGES
6
 
 VIEWS
7
 
+INNODB_CMP_RESET
8
 
+INNODB_TRX
9
 
+INNODB_CMPMEM_RESET
10
 
+INNODB_LOCK_WAITS
11
 
+INNODB_CMPMEM
12
 
+INNODB_CMP
13
 
+INNODB_LOCKS
14
 
 columns_priv
15
 
 db
16
 
 event
17
 
@@ -799,6 +806,8 @@
18
 
 TABLES UPDATE_TIME     datetime
19
 
 TABLES CHECK_TIME      datetime
20
 
 TRIGGERS       CREATED datetime
21
 
+INNODB_TRX     trx_started     datetime
22
 
+INNODB_TRX     trx_wait_started        datetime
23
 
 event  execute_at      datetime
24
 
 event  last_executed   datetime
25
 
 event  starts  datetime
26
 
@@ -852,7 +861,7 @@
27
 
 flush privileges;
28
 
 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;
29
 
 table_schema   count(*)
30
 
-information_schema     28
31
 
+information_schema     35
32
 
 mysql  22
33
 
 create table t1 (i int, j int);
34
 
 create trigger trg1 before insert on t1 for each row
35
 
@@ -1267,6 +1276,13 @@
36
 
 TRIGGERS       TRIGGER_SCHEMA
37
 
 USER_PRIVILEGES        GRANTEE
38
 
 VIEWS  TABLE_SCHEMA
39
 
+INNODB_CMP_RESET       page_size
40
 
+INNODB_TRX     trx_id
41
 
+INNODB_CMPMEM_RESET    page_size
42
 
+INNODB_LOCK_WAITS      requesting_trx_id
43
 
+INNODB_CMPMEM  page_size
44
 
+INNODB_CMP     page_size
45
 
+INNODB_LOCKS   lock_id
46
 
 SELECT t.table_name, c1.column_name
47
 
 FROM information_schema.tables t
48
 
 INNER JOIN
49
 
@@ -1310,6 +1326,13 @@
50
 
 TRIGGERS       TRIGGER_SCHEMA
51
 
 USER_PRIVILEGES        GRANTEE
52
 
 VIEWS  TABLE_SCHEMA
53
 
+INNODB_CMP_RESET       page_size
54
 
+INNODB_TRX     trx_id
55
 
+INNODB_CMPMEM_RESET    page_size
56
 
+INNODB_LOCK_WAITS      requesting_trx_id
57
 
+INNODB_CMPMEM  page_size
58
 
+INNODB_CMP     page_size
59
 
+INNODB_LOCKS   lock_id
60
 
 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
61
 
 MAX(table_name)
62
 
 VIEWS
63
 
@@ -1386,6 +1409,13 @@
64
 
 FILES  information_schema.FILES        1
65
 
 GLOBAL_STATUS  information_schema.GLOBAL_STATUS        1
66
 
 GLOBAL_VARIABLES       information_schema.GLOBAL_VARIABLES     1
67
 
+INNODB_CMP     information_schema.INNODB_CMP   1
68
 
+INNODB_CMPMEM  information_schema.INNODB_CMPMEM        1
69
 
+INNODB_CMPMEM_RESET    information_schema.INNODB_CMPMEM_RESET  1
70
 
+INNODB_CMP_RESET       information_schema.INNODB_CMP_RESET     1
71
 
+INNODB_LOCKS   information_schema.INNODB_LOCKS 1
72
 
+INNODB_LOCK_WAITS      information_schema.INNODB_LOCK_WAITS    1
73
 
+INNODB_TRX     information_schema.INNODB_TRX   1
74
 
 KEY_COLUMN_USAGE       information_schema.KEY_COLUMN_USAGE     1
75
 
 PARTITIONS     information_schema.PARTITIONS   1
76
 
 PLUGINS        information_schema.PLUGINS      1
77
 
diff mysql-test/r/information_schema_db.result.orig mysql-test/r/information_schema_db.result
78
 
--- mysql-test/r/information_schema_db.result.orig      2008-08-04 09:27:49.000000000 +0300
79
 
+++ mysql-test/r/information_schema_db.result   2008-10-07 12:26:31.000000000 +0300
80
 
@@ -33,6 +33,13 @@
81
 
 TRIGGERS
82
 
 USER_PRIVILEGES
83
 
 VIEWS
84
 
+INNODB_CMP_RESET
85
 
+INNODB_TRX
86
 
+INNODB_CMPMEM_RESET
87
 
+INNODB_LOCK_WAITS
88
 
+INNODB_CMPMEM
89
 
+INNODB_CMP
90
 
+INNODB_LOCKS
91
 
 show tables from INFORMATION_SCHEMA like 'T%';
92
 
 Tables_in_information_schema (T%)
93
 
 TABLES
94
 
diff mysql-test/r/mysqlshow.result.orig mysql-test/r/mysqlshow.result
95
 
--- mysql-test/r/mysqlshow.result.orig  2008-08-04 09:27:51.000000000 +0300
96
 
+++ mysql-test/r/mysqlshow.result       2008-10-07 12:35:39.000000000 +0300
97
 
@@ -107,6 +107,13 @@
98
 
 | TRIGGERS                              |
99
 
 | USER_PRIVILEGES                       |
100
 
 | VIEWS                                 |
101
 
+| INNODB_CMP_RESET                      |
102
 
+| INNODB_TRX                            |
103
 
+| INNODB_CMPMEM_RESET                   |
104
 
+| INNODB_LOCK_WAITS                     |
105
 
+| INNODB_CMPMEM                         |
106
 
+| INNODB_CMP                            |
107
 
+| INNODB_LOCKS                          |
108
 
 +---------------------------------------+
109
 
 Database: INFORMATION_SCHEMA
110
 
 +---------------------------------------+
111
 
@@ -140,6 +147,13 @@
112
 
 | TRIGGERS                              |
113
 
 | USER_PRIVILEGES                       |
114
 
 | VIEWS                                 |
115
 
+| INNODB_CMP_RESET                      |
116
 
+| INNODB_TRX                            |
117
 
+| INNODB_CMPMEM_RESET                   |
118
 
+| INNODB_LOCK_WAITS                     |
119
 
+| INNODB_CMPMEM                         |
120
 
+| INNODB_CMP                            |
121
 
+| INNODB_LOCKS                          |
122
 
 +---------------------------------------+
123
 
 Wildcard: inf_rmation_schema
124
 
 +--------------------+