Merge lp:~stewart/percona-server/bug1009997 into lp:percona-server/5.1
- bug1009997
- Merge into 5.1
Proposed by
Stewart Smith
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 453 |
Proposed branch: | lp:~stewart/percona-server/bug1009997 |
Merge into: | lp:percona-server/5.1 |
Diff against target: |
423 lines (+11/-230) 8 files modified
Percona-Server/mysql-test/r/information_schema.result (+7/-11) Percona-Server/mysql-test/r/information_schema_db.result (+1/-2) Percona-Server/mysql-test/r/mysqlshow.result (+2/-4) Percona-Server/storage/innodb_plugin/Makefile.am (+0/-1) Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc (+1/-2) Percona-Server/storage/innodb_plugin/handler/i_s.cc (+0/-158) Percona-Server/storage/innodb_plugin/handler/i_s.h (+0/-1) Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h (+0/-51) |
To merge this branch: | bzr merge lp:~stewart/percona-server/bug1009997 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+110232@code.launchpad.net |
Commit message
Description of the change
Remove the very out of date XTRADB_ENHANCEMENTS INFORMATION_SCHEMA table. It's out of date so cannot be any use to anybody.
http://
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Percona-Server/mysql-test/r/information_schema.result' | |||
2 | --- Percona-Server/mysql-test/r/information_schema.result 2011-11-24 02:00:56 +0000 | |||
3 | +++ Percona-Server/mysql-test/r/information_schema.result 2012-06-14 05:54:20 +0000 | |||
4 | @@ -83,7 +83,7 @@ | |||
5 | 83 | INNODB_RSEG | 83 | INNODB_RSEG |
6 | 84 | INNODB_LOCKS | 84 | INNODB_LOCKS |
7 | 85 | INNODB_BUFFER_POOL_PAGES | 85 | INNODB_BUFFER_POOL_PAGES |
9 | 86 | XTRADB_ENHANCEMENTS | 86 | INNODB_TABLE_STATS |
10 | 87 | INNODB_TRX | 87 | INNODB_TRX |
11 | 88 | XTRADB_ADMIN_COMMAND | 88 | XTRADB_ADMIN_COMMAND |
12 | 89 | INNODB_LOCK_WAITS | 89 | INNODB_LOCK_WAITS |
13 | @@ -96,7 +96,6 @@ | |||
14 | 96 | INNODB_SYS_INDEXES | 96 | INNODB_SYS_INDEXES |
15 | 97 | INNODB_BUFFER_POOL_PAGES_BLOB | 97 | INNODB_BUFFER_POOL_PAGES_BLOB |
16 | 98 | INNODB_CMPMEM_RESET | 98 | INNODB_CMPMEM_RESET |
17 | 99 | INNODB_TABLE_STATS | ||
18 | 100 | columns_priv | 99 | columns_priv |
19 | 101 | db | 100 | db |
20 | 102 | event | 101 | event |
21 | @@ -901,14 +900,14 @@ | |||
22 | 901 | TEMPORARY_TABLES TABLE_NAME select | 900 | TEMPORARY_TABLES TABLE_NAME select |
23 | 902 | TABLE_STATISTICS TABLE_NAME select | 901 | TABLE_STATISTICS TABLE_NAME select |
24 | 903 | VIEWS TABLE_NAME select | 902 | VIEWS TABLE_NAME select |
25 | 903 | INNODB_TABLE_STATS table_name select | ||
26 | 904 | INNODB_INDEX_STATS table_name select | 904 | INNODB_INDEX_STATS table_name select |
27 | 905 | INNODB_TABLE_STATS table_name select | ||
28 | 906 | delete from mysql.user where user='mysqltest_4'; | 905 | delete from mysql.user where user='mysqltest_4'; |
29 | 907 | delete from mysql.db where user='mysqltest_4'; | 906 | delete from mysql.db where user='mysqltest_4'; |
30 | 908 | flush privileges; | 907 | flush privileges; |
31 | 909 | 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; | 908 | 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; |
32 | 910 | table_schema count(*) | 909 | table_schema count(*) |
34 | 911 | information_schema 54 | 910 | information_schema 53 |
35 | 912 | mysql 22 | 911 | mysql 22 |
36 | 913 | create table t1 (i int, j int); | 912 | create table t1 (i int, j int); |
37 | 914 | create trigger trg1 before insert on t1 for each row | 913 | create trigger trg1 before insert on t1 for each row |
38 | @@ -1335,7 +1334,7 @@ | |||
39 | 1335 | INNODB_RSEG rseg_id | 1334 | INNODB_RSEG rseg_id |
40 | 1336 | INNODB_LOCKS lock_id | 1335 | INNODB_LOCKS lock_id |
41 | 1337 | INNODB_BUFFER_POOL_PAGES page_type | 1336 | INNODB_BUFFER_POOL_PAGES page_type |
43 | 1338 | XTRADB_ENHANCEMENTS name | 1337 | INNODB_TABLE_STATS table_schema |
44 | 1339 | INNODB_TRX trx_id | 1338 | INNODB_TRX trx_id |
45 | 1340 | XTRADB_ADMIN_COMMAND result_message | 1339 | XTRADB_ADMIN_COMMAND result_message |
46 | 1341 | INNODB_LOCK_WAITS requesting_trx_id | 1340 | INNODB_LOCK_WAITS requesting_trx_id |
47 | @@ -1348,7 +1347,6 @@ | |||
48 | 1348 | INNODB_SYS_INDEXES TABLE_ID | 1347 | INNODB_SYS_INDEXES TABLE_ID |
49 | 1349 | INNODB_BUFFER_POOL_PAGES_BLOB space_id | 1348 | INNODB_BUFFER_POOL_PAGES_BLOB space_id |
50 | 1350 | INNODB_CMPMEM_RESET page_size | 1349 | INNODB_CMPMEM_RESET page_size |
51 | 1351 | INNODB_TABLE_STATS table_schema | ||
52 | 1352 | SELECT t.table_name, c1.column_name | 1350 | SELECT t.table_name, c1.column_name |
53 | 1353 | FROM information_schema.tables t | 1351 | FROM information_schema.tables t |
54 | 1354 | INNER JOIN | 1352 | INNER JOIN |
55 | @@ -1404,7 +1402,7 @@ | |||
56 | 1404 | INNODB_RSEG rseg_id | 1402 | INNODB_RSEG rseg_id |
57 | 1405 | INNODB_LOCKS lock_id | 1403 | INNODB_LOCKS lock_id |
58 | 1406 | INNODB_BUFFER_POOL_PAGES page_type | 1404 | INNODB_BUFFER_POOL_PAGES page_type |
60 | 1407 | XTRADB_ENHANCEMENTS name | 1405 | INNODB_TABLE_STATS table_schema |
61 | 1408 | INNODB_TRX trx_id | 1406 | INNODB_TRX trx_id |
62 | 1409 | XTRADB_ADMIN_COMMAND result_message | 1407 | XTRADB_ADMIN_COMMAND result_message |
63 | 1410 | INNODB_LOCK_WAITS requesting_trx_id | 1408 | INNODB_LOCK_WAITS requesting_trx_id |
64 | @@ -1417,15 +1415,14 @@ | |||
65 | 1417 | INNODB_SYS_INDEXES TABLE_ID | 1415 | INNODB_SYS_INDEXES TABLE_ID |
66 | 1418 | INNODB_BUFFER_POOL_PAGES_BLOB space_id | 1416 | INNODB_BUFFER_POOL_PAGES_BLOB space_id |
67 | 1419 | INNODB_CMPMEM_RESET page_size | 1417 | INNODB_CMPMEM_RESET page_size |
68 | 1420 | INNODB_TABLE_STATS table_schema | ||
69 | 1421 | SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'); | 1418 | SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'); |
70 | 1422 | MAX(table_name) | 1419 | MAX(table_name) |
72 | 1423 | XTRADB_ENHANCEMENTS | 1420 | XTRADB_ADMIN_COMMAND |
73 | 1424 | SELECT table_name from information_schema.tables | 1421 | SELECT table_name from information_schema.tables |
74 | 1425 | WHERE table_name=(SELECT MAX(table_name) | 1422 | WHERE table_name=(SELECT MAX(table_name) |
75 | 1426 | FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test')); | 1423 | FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test')); |
76 | 1427 | table_name | 1424 | table_name |
78 | 1428 | XTRADB_ENHANCEMENTS | 1425 | XTRADB_ADMIN_COMMAND |
79 | 1429 | DROP TABLE IF EXISTS bug23037; | 1426 | DROP TABLE IF EXISTS bug23037; |
80 | 1430 | DROP FUNCTION IF EXISTS get_value; | 1427 | DROP FUNCTION IF EXISTS get_value; |
81 | 1431 | SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037'; | 1428 | SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037'; |
82 | @@ -1536,7 +1533,6 @@ | |||
83 | 1536 | USER_PRIVILEGES information_schema.USER_PRIVILEGES 1 | 1533 | USER_PRIVILEGES information_schema.USER_PRIVILEGES 1 |
84 | 1537 | USER_STATISTICS information_schema.USER_STATISTICS 1 | 1534 | USER_STATISTICS information_schema.USER_STATISTICS 1 |
85 | 1538 | VIEWS information_schema.VIEWS 1 | 1535 | VIEWS information_schema.VIEWS 1 |
86 | 1539 | XTRADB_ENHANCEMENTS information_schema.XTRADB_ENHANCEMENTS 1 | ||
87 | 1540 | create table t1(f1 int); | 1536 | create table t1(f1 int); |
88 | 1541 | create view v1 as select f1+1 as a from t1; | 1537 | create view v1 as select f1+1 as a from t1; |
89 | 1542 | create table t2 (f1 int, f2 int); | 1538 | create table t2 (f1 int, f2 int); |
90 | 1543 | 1539 | ||
91 | === modified file 'Percona-Server/mysql-test/r/information_schema_db.result' | |||
92 | --- Percona-Server/mysql-test/r/information_schema_db.result 2011-11-24 02:00:56 +0000 | |||
93 | +++ Percona-Server/mysql-test/r/information_schema_db.result 2012-06-14 05:54:20 +0000 | |||
94 | @@ -45,7 +45,7 @@ | |||
95 | 45 | INNODB_RSEG | 45 | INNODB_RSEG |
96 | 46 | INNODB_LOCKS | 46 | INNODB_LOCKS |
97 | 47 | INNODB_BUFFER_POOL_PAGES | 47 | INNODB_BUFFER_POOL_PAGES |
99 | 48 | XTRADB_ENHANCEMENTS | 48 | INNODB_TABLE_STATS |
100 | 49 | INNODB_TRX | 49 | INNODB_TRX |
101 | 50 | XTRADB_ADMIN_COMMAND | 50 | XTRADB_ADMIN_COMMAND |
102 | 51 | INNODB_LOCK_WAITS | 51 | INNODB_LOCK_WAITS |
103 | @@ -58,7 +58,6 @@ | |||
104 | 58 | INNODB_SYS_INDEXES | 58 | INNODB_SYS_INDEXES |
105 | 59 | INNODB_BUFFER_POOL_PAGES_BLOB | 59 | INNODB_BUFFER_POOL_PAGES_BLOB |
106 | 60 | INNODB_CMPMEM_RESET | 60 | INNODB_CMPMEM_RESET |
107 | 61 | INNODB_TABLE_STATS | ||
108 | 62 | show tables from INFORMATION_SCHEMA like 'T%'; | 61 | show tables from INFORMATION_SCHEMA like 'T%'; |
109 | 63 | Tables_in_information_schema (T%) | 62 | Tables_in_information_schema (T%) |
110 | 64 | TABLES | 63 | TABLES |
111 | 65 | 64 | ||
112 | === modified file 'Percona-Server/mysql-test/r/mysqlshow.result' | |||
113 | --- Percona-Server/mysql-test/r/mysqlshow.result 2011-11-24 02:00:56 +0000 | |||
114 | +++ Percona-Server/mysql-test/r/mysqlshow.result 2012-06-14 05:54:20 +0000 | |||
115 | @@ -119,7 +119,7 @@ | |||
116 | 119 | | INNODB_RSEG | | 119 | | INNODB_RSEG | |
117 | 120 | | INNODB_LOCKS | | 120 | | INNODB_LOCKS | |
118 | 121 | | INNODB_BUFFER_POOL_PAGES | | 121 | | INNODB_BUFFER_POOL_PAGES | |
120 | 122 | | XTRADB_ENHANCEMENTS | | 122 | | INNODB_TABLE_STATS | |
121 | 123 | | INNODB_TRX | | 123 | | INNODB_TRX | |
122 | 124 | | XTRADB_ADMIN_COMMAND | | 124 | | XTRADB_ADMIN_COMMAND | |
123 | 125 | | INNODB_LOCK_WAITS | | 125 | | INNODB_LOCK_WAITS | |
124 | @@ -132,7 +132,6 @@ | |||
125 | 132 | | INNODB_SYS_INDEXES | | 132 | | INNODB_SYS_INDEXES | |
126 | 133 | | INNODB_BUFFER_POOL_PAGES_BLOB | | 133 | | INNODB_BUFFER_POOL_PAGES_BLOB | |
127 | 134 | | INNODB_CMPMEM_RESET | | 134 | | INNODB_CMPMEM_RESET | |
128 | 135 | | INNODB_TABLE_STATS | | ||
129 | 136 | +---------------------------------------+ | 135 | +---------------------------------------+ |
130 | 137 | Database: INFORMATION_SCHEMA | 136 | Database: INFORMATION_SCHEMA |
131 | 138 | +---------------------------------------+ | 137 | +---------------------------------------+ |
132 | @@ -178,7 +177,7 @@ | |||
133 | 178 | | INNODB_RSEG | | 177 | | INNODB_RSEG | |
134 | 179 | | INNODB_LOCKS | | 178 | | INNODB_LOCKS | |
135 | 180 | | INNODB_BUFFER_POOL_PAGES | | 179 | | INNODB_BUFFER_POOL_PAGES | |
137 | 181 | | XTRADB_ENHANCEMENTS | | 180 | | INNODB_TABLE_STATS | |
138 | 182 | | INNODB_TRX | | 181 | | INNODB_TRX | |
139 | 183 | | XTRADB_ADMIN_COMMAND | | 182 | | XTRADB_ADMIN_COMMAND | |
140 | 184 | | INNODB_LOCK_WAITS | | 183 | | INNODB_LOCK_WAITS | |
141 | @@ -191,7 +190,6 @@ | |||
142 | 191 | | INNODB_SYS_INDEXES | | 190 | | INNODB_SYS_INDEXES | |
143 | 192 | | INNODB_BUFFER_POOL_PAGES_BLOB | | 191 | | INNODB_BUFFER_POOL_PAGES_BLOB | |
144 | 193 | | INNODB_CMPMEM_RESET | | 192 | | INNODB_CMPMEM_RESET | |
145 | 194 | | INNODB_TABLE_STATS | | ||
146 | 195 | +---------------------------------------+ | 193 | +---------------------------------------+ |
147 | 196 | Wildcard: inf_rmation_schema | 194 | Wildcard: inf_rmation_schema |
148 | 197 | +--------------------+ | 195 | +--------------------+ |
149 | 198 | 196 | ||
150 | === modified file 'Percona-Server/storage/innodb_plugin/Makefile.am' | |||
151 | --- Percona-Server/storage/innodb_plugin/Makefile.am 2011-11-24 02:00:02 +0000 | |||
152 | +++ Percona-Server/storage/innodb_plugin/Makefile.am 2012-06-14 05:54:20 +0000 | |||
153 | @@ -226,7 +226,6 @@ | |||
154 | 226 | include/ut0vec.h \ | 226 | include/ut0vec.h \ |
155 | 227 | include/ut0vec.ic \ | 227 | include/ut0vec.ic \ |
156 | 228 | include/ut0wqueue.h \ | 228 | include/ut0wqueue.h \ |
157 | 229 | handler/innodb_patch_info.h \ | ||
158 | 230 | mem/mem0dbg.c | 229 | mem/mem0dbg.c |
159 | 231 | 230 | ||
160 | 232 | EXTRA_LIBRARIES= libinnobase.a | 231 | EXTRA_LIBRARIES= libinnobase.a |
161 | 233 | 232 | ||
162 | === modified file 'Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc' | |||
163 | --- Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2012-05-09 04:14:12 +0000 | |||
164 | +++ Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc 2012-06-14 05:54:20 +0000 | |||
165 | @@ -12224,8 +12224,7 @@ | |||
166 | 12224 | i_s_innodb_admin_command, | 12224 | i_s_innodb_admin_command, |
167 | 12225 | i_s_innodb_sys_tables, | 12225 | i_s_innodb_sys_tables, |
168 | 12226 | i_s_innodb_sys_indexes, | 12226 | i_s_innodb_sys_indexes, |
171 | 12227 | i_s_innodb_sys_stats, | 12227 | i_s_innodb_sys_stats |
170 | 12228 | i_s_innodb_patches | ||
172 | 12229 | mysql_declare_plugin_end; | 12228 | mysql_declare_plugin_end; |
173 | 12230 | 12229 | ||
174 | 12231 | /** @brief Initialize the default value of innodb_commit_concurrency. | 12230 | /** @brief Initialize the default value of innodb_commit_concurrency. |
175 | 12232 | 12231 | ||
176 | === modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc' | |||
177 | --- Percona-Server/storage/innodb_plugin/handler/i_s.cc 2011-11-24 16:33:30 +0000 | |||
178 | +++ Percona-Server/storage/innodb_plugin/handler/i_s.cc 2012-06-14 05:54:20 +0000 | |||
179 | @@ -32,7 +32,6 @@ | |||
180 | 32 | #include <mysys_err.h> | 32 | #include <mysys_err.h> |
181 | 33 | #include <my_sys.h> | 33 | #include <my_sys.h> |
182 | 34 | #include "i_s.h" | 34 | #include "i_s.h" |
183 | 35 | #include "innodb_patch_info.h" | ||
184 | 36 | #include <mysql/plugin.h> | 35 | #include <mysql/plugin.h> |
185 | 37 | 36 | ||
186 | 38 | extern "C" { | 37 | extern "C" { |
187 | @@ -224,168 +223,11 @@ | |||
188 | 224 | return(ret); | 223 | return(ret); |
189 | 225 | } | 224 | } |
190 | 226 | 225 | ||
191 | 227 | /* Fields of the dynamic table INFORMATION_SCHEMA.innodb_patches */ | ||
192 | 228 | static ST_FIELD_INFO innodb_patches_fields_info[] = | ||
193 | 229 | { | ||
194 | 230 | #define IDX_PATCH_NAME 0 | ||
195 | 231 | {STRUCT_FLD(field_name, "name"), | ||
196 | 232 | STRUCT_FLD(field_length, 255), | ||
197 | 233 | STRUCT_FLD(field_type, MYSQL_TYPE_STRING), | ||
198 | 234 | STRUCT_FLD(value, 0), | ||
199 | 235 | STRUCT_FLD(field_flags, 0), | ||
200 | 236 | STRUCT_FLD(old_name, ""), | ||
201 | 237 | STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, | ||
202 | 238 | |||
203 | 239 | #define IDX_PATCH_DESCR 1 | ||
204 | 240 | {STRUCT_FLD(field_name, "description"), | ||
205 | 241 | STRUCT_FLD(field_length, 255), | ||
206 | 242 | STRUCT_FLD(field_type, MYSQL_TYPE_STRING), | ||
207 | 243 | STRUCT_FLD(value, 0), | ||
208 | 244 | STRUCT_FLD(field_flags, 0), | ||
209 | 245 | STRUCT_FLD(old_name, ""), | ||
210 | 246 | STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, | ||
211 | 247 | |||
212 | 248 | #define IDX_PATCH_COMMENT 2 | ||
213 | 249 | {STRUCT_FLD(field_name, "comment"), | ||
214 | 250 | STRUCT_FLD(field_length, 100), | ||
215 | 251 | STRUCT_FLD(field_type, MYSQL_TYPE_STRING), | ||
216 | 252 | STRUCT_FLD(value, 0), | ||
217 | 253 | STRUCT_FLD(field_flags, 0), | ||
218 | 254 | STRUCT_FLD(old_name, ""), | ||
219 | 255 | STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, | ||
220 | 256 | |||
221 | 257 | #define IDX_PATCH_LINK 3 | ||
222 | 258 | {STRUCT_FLD(field_name, "link"), | ||
223 | 259 | STRUCT_FLD(field_length, 255), | ||
224 | 260 | STRUCT_FLD(field_type, MYSQL_TYPE_STRING), | ||
225 | 261 | STRUCT_FLD(value, 0), | ||
226 | 262 | STRUCT_FLD(field_flags, 0), | ||
227 | 263 | STRUCT_FLD(old_name, ""), | ||
228 | 264 | STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, | ||
229 | 265 | |||
230 | 266 | END_OF_ST_FIELD_INFO | ||
231 | 267 | }; | ||
232 | 268 | |||
233 | 269 | static struct st_mysql_information_schema i_s_info = | 226 | static struct st_mysql_information_schema i_s_info = |
234 | 270 | { | 227 | { |
235 | 271 | MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION | 228 | MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION |
236 | 272 | }; | 229 | }; |
237 | 273 | 230 | ||
238 | 274 | /*********************************************************************** | ||
239 | 275 | Fill the dynamic table information_schema.innodb_patches */ | ||
240 | 276 | static | ||
241 | 277 | int | ||
242 | 278 | innodb_patches_fill( | ||
243 | 279 | /*=============*/ | ||
244 | 280 | /* out: 0 on success, 1 on failure */ | ||
245 | 281 | THD* thd, /* in: thread */ | ||
246 | 282 | TABLE_LIST* tables, /* in/out: tables to fill */ | ||
247 | 283 | COND* cond) /* in: condition (ignored) */ | ||
248 | 284 | { | ||
249 | 285 | TABLE* table = (TABLE *) tables->table; | ||
250 | 286 | int status = 0; | ||
251 | 287 | int i; | ||
252 | 288 | Field** fields; | ||
253 | 289 | |||
254 | 290 | |||
255 | 291 | DBUG_ENTER("innodb_patches_fill"); | ||
256 | 292 | fields = table->field; | ||
257 | 293 | |||
258 | 294 | /* deny access to non-superusers */ | ||
259 | 295 | if (check_global_access(thd, PROCESS_ACL)) { | ||
260 | 296 | |||
261 | 297 | DBUG_RETURN(0); | ||
262 | 298 | } | ||
263 | 299 | |||
264 | 300 | RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name); | ||
265 | 301 | |||
266 | 302 | for (i = 0; innodb_enhancements[i].file; i++) { | ||
267 | 303 | |||
268 | 304 | field_store_string(fields[0],innodb_enhancements[i].file); | ||
269 | 305 | field_store_string(fields[1],innodb_enhancements[i].name); | ||
270 | 306 | field_store_string(fields[2],innodb_enhancements[i].comment); | ||
271 | 307 | field_store_string(fields[3],innodb_enhancements[i].link); | ||
272 | 308 | |||
273 | 309 | if (schema_table_store_record(thd, table)) { | ||
274 | 310 | status = 1; | ||
275 | 311 | break; | ||
276 | 312 | } | ||
277 | 313 | |||
278 | 314 | } | ||
279 | 315 | |||
280 | 316 | |||
281 | 317 | DBUG_RETURN(status); | ||
282 | 318 | } | ||
283 | 319 | |||
284 | 320 | /*********************************************************************** | ||
285 | 321 | Bind the dynamic table information_schema.innodb_patches. */ | ||
286 | 322 | static | ||
287 | 323 | int | ||
288 | 324 | innodb_patches_init( | ||
289 | 325 | /*=========*/ | ||
290 | 326 | /* out: 0 on success */ | ||
291 | 327 | void* p) /* in/out: table schema object */ | ||
292 | 328 | { | ||
293 | 329 | DBUG_ENTER("innodb_patches_init"); | ||
294 | 330 | ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; | ||
295 | 331 | |||
296 | 332 | schema->fields_info = innodb_patches_fields_info; | ||
297 | 333 | schema->fill_table = innodb_patches_fill; | ||
298 | 334 | |||
299 | 335 | DBUG_RETURN(0); | ||
300 | 336 | } | ||
301 | 337 | |||
302 | 338 | |||
303 | 339 | UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches = | ||
304 | 340 | { | ||
305 | 341 | /* the plugin type (a MYSQL_XXX_PLUGIN value) */ | ||
306 | 342 | /* int */ | ||
307 | 343 | STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN), | ||
308 | 344 | |||
309 | 345 | /* pointer to type-specific plugin descriptor */ | ||
310 | 346 | /* void* */ | ||
311 | 347 | STRUCT_FLD(info, &i_s_info), | ||
312 | 348 | |||
313 | 349 | /* plugin name */ | ||
314 | 350 | /* const char* */ | ||
315 | 351 | STRUCT_FLD(name, "XTRADB_ENHANCEMENTS"), | ||
316 | 352 | |||
317 | 353 | /* plugin author (for SHOW PLUGINS) */ | ||
318 | 354 | /* const char* */ | ||
319 | 355 | STRUCT_FLD(author, "Percona"), | ||
320 | 356 | |||
321 | 357 | /* general descriptive text (for SHOW PLUGINS) */ | ||
322 | 358 | /* const char* */ | ||
323 | 359 | STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"), | ||
324 | 360 | |||
325 | 361 | /* the plugin license (PLUGIN_LICENSE_XXX) */ | ||
326 | 362 | /* int */ | ||
327 | 363 | STRUCT_FLD(license, PLUGIN_LICENSE_GPL), | ||
328 | 364 | |||
329 | 365 | /* the function to invoke when plugin is loaded */ | ||
330 | 366 | /* int (*)(void*); */ | ||
331 | 367 | STRUCT_FLD(init, innodb_patches_init), | ||
332 | 368 | |||
333 | 369 | /* the function to invoke when plugin is unloaded */ | ||
334 | 370 | /* int (*)(void*); */ | ||
335 | 371 | STRUCT_FLD(deinit, i_s_common_deinit), | ||
336 | 372 | |||
337 | 373 | /* plugin version (for SHOW PLUGINS) */ | ||
338 | 374 | /* unsigned int */ | ||
339 | 375 | STRUCT_FLD(version, INNODB_VERSION_SHORT), | ||
340 | 376 | |||
341 | 377 | /* struct st_mysql_show_var* */ | ||
342 | 378 | STRUCT_FLD(status_vars, NULL), | ||
343 | 379 | |||
344 | 380 | /* struct st_mysql_sys_var** */ | ||
345 | 381 | STRUCT_FLD(system_vars, NULL), | ||
346 | 382 | |||
347 | 383 | /* reserved for dependency checking */ | ||
348 | 384 | /* void* */ | ||
349 | 385 | STRUCT_FLD(__reserved1, NULL) | ||
350 | 386 | }; | ||
351 | 387 | |||
352 | 388 | |||
353 | 389 | static ST_FIELD_INFO i_s_innodb_buffer_pool_pages_fields_info[] = | 231 | static ST_FIELD_INFO i_s_innodb_buffer_pool_pages_fields_info[] = |
354 | 390 | { | 232 | { |
355 | 391 | {STRUCT_FLD(field_name, "page_type"), | 233 | {STRUCT_FLD(field_name, "page_type"), |
356 | 392 | 234 | ||
357 | === modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.h' | |||
358 | --- Percona-Server/storage/innodb_plugin/handler/i_s.h 2011-11-24 02:00:45 +0000 | |||
359 | +++ Percona-Server/storage/innodb_plugin/handler/i_s.h 2012-06-14 05:54:20 +0000 | |||
360 | @@ -36,7 +36,6 @@ | |||
361 | 36 | extern struct st_mysql_plugin i_s_innodb_cmp_reset; | 36 | extern struct st_mysql_plugin i_s_innodb_cmp_reset; |
362 | 37 | extern struct st_mysql_plugin i_s_innodb_cmpmem; | 37 | extern struct st_mysql_plugin i_s_innodb_cmpmem; |
363 | 38 | extern struct st_mysql_plugin i_s_innodb_cmpmem_reset; | 38 | extern struct st_mysql_plugin i_s_innodb_cmpmem_reset; |
364 | 39 | extern struct st_mysql_plugin i_s_innodb_patches; | ||
365 | 40 | extern struct st_mysql_plugin i_s_innodb_rseg; | 39 | extern struct st_mysql_plugin i_s_innodb_rseg; |
366 | 41 | extern struct st_mysql_plugin i_s_innodb_table_stats; | 40 | extern struct st_mysql_plugin i_s_innodb_table_stats; |
367 | 42 | extern struct st_mysql_plugin i_s_innodb_index_stats; | 41 | extern struct st_mysql_plugin i_s_innodb_index_stats; |
368 | 43 | 42 | ||
369 | === removed file 'Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h' | |||
370 | --- Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h 2011-11-24 02:00:45 +0000 | |||
371 | +++ Percona-Server/storage/innodb_plugin/handler/innodb_patch_info.h 1970-01-01 00:00:00 +0000 | |||
372 | @@ -1,51 +0,0 @@ | |||
373 | 1 | /* Copyright (C) 2002-2006 MySQL AB | ||
374 | 2 | |||
375 | 3 | This program is free software; you can redistribute it and/or modify | ||
376 | 4 | it under the terms of the GNU General Public License as published by | ||
377 | 5 | the Free Software Foundation; version 2 of the License. | ||
378 | 6 | |||
379 | 7 | This program is distributed in the hope that it will be useful, | ||
380 | 8 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
381 | 9 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
382 | 10 | GNU General Public License for more details. | ||
383 | 11 | |||
384 | 12 | You should have received a copy of the GNU General Public License | ||
385 | 13 | along with this program; if not, write to the Free Software | ||
386 | 14 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | ||
387 | 15 | |||
388 | 16 | #ifdef USE_PRAGMA_INTERFACE | ||
389 | 17 | #pragma interface /* gcc class implementation */ | ||
390 | 18 | #endif | ||
391 | 19 | |||
392 | 20 | struct innodb_enhancement { | ||
393 | 21 | const char *file; | ||
394 | 22 | const char *name; | ||
395 | 23 | const char *comment; | ||
396 | 24 | const char *link; | ||
397 | 25 | }innodb_enhancements[] = { | ||
398 | 26 | {"xtradb_show_enhancements","I_S.XTRADB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
399 | 27 | {"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
400 | 28 | {"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
401 | 29 | {"innodb_opt_lru_count","Fix of buffer_pool mutex","Decreases contention on buffer_pool mutex on LRU operations","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
402 | 30 | {"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
403 | 31 | {"innodb_expand_undo_slots","expandable maximum number of undo slots","from 1024 (default) to about 4000","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
404 | 32 | {"innodb_extra_rseg","allow to create extra rollback segments","When create new db, the new parameter allows to create more rollback segments","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
405 | 33 | {"innodb_overwrite_relay_log_info","overwrite relay-log.info when slave recovery","Building as plugin, it is not used.","http://www.percona.com/docs/wiki/percona-xtradb:innodb_overwrite_relay_log_info"}, | ||
406 | 34 | {"innodb_thread_concurrency_timer_based","use InnoDB timer based concurrency throttling (backport from MySQL 5.4.0)","",""}, | ||
407 | 35 | {"innodb_expand_import","convert .ibd file automatically when import tablespace","the files are generated by xtrabackup export mode.","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
408 | 36 | {"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
409 | 37 | {"innodb_split_buf_pool_mutex","More fix of buffer_pool mutex","Spliting buf_pool_mutex and optimizing based on innodb_opt_lru_count","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
410 | 38 | {"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
411 | 39 | {"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
412 | 40 | {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
413 | 41 | {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
414 | 42 | {"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
415 | 43 | {"innodb_extend_slow","Extended statistics in slow.log","It is InnoDB-part only. It needs to patch also to mysqld.","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
416 | 44 | {"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
417 | 45 | {"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
418 | 46 | {"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
419 | 47 | {"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
420 | 48 | {"innodb_files_extend","allow >4GB transaction log files, and can vary universal page size of datafiles","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
421 | 49 | {"innodb_sys_tables_sys_indexes","Expose InnoDB SYS_TABLES and SYS_INDEXES schema tables","","http://www.percona.com/docs/wiki/percona-xtradb"}, | ||
422 | 50 | {NULL, NULL, NULL, NULL} | ||
423 | 51 | }; |