Merge lp:~stewart/percona-server/bug1009997 into lp:percona-server/5.1

Proposed by Stewart Smith on 2012-06-14
Status: Merged
Approved by: Laurynas Biveinis on 2012-06-14
Approved revision: 448
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
Reviewer Review Type Date Requested Status
Laurynas Biveinis 2012-06-14 Approve on 2012-06-14
Review via email: mp+110232@code.launchpad.net

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://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/331/

To post a comment you must log in.
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 INNODB_RSEG
6 INNODB_LOCKS
7 INNODB_BUFFER_POOL_PAGES
8-XTRADB_ENHANCEMENTS
9+INNODB_TABLE_STATS
10 INNODB_TRX
11 XTRADB_ADMIN_COMMAND
12 INNODB_LOCK_WAITS
13@@ -96,7 +96,6 @@
14 INNODB_SYS_INDEXES
15 INNODB_BUFFER_POOL_PAGES_BLOB
16 INNODB_CMPMEM_RESET
17-INNODB_TABLE_STATS
18 columns_priv
19 db
20 event
21@@ -901,14 +900,14 @@
22 TEMPORARY_TABLES TABLE_NAME select
23 TABLE_STATISTICS TABLE_NAME select
24 VIEWS TABLE_NAME select
25+INNODB_TABLE_STATS table_name select
26 INNODB_INDEX_STATS table_name select
27-INNODB_TABLE_STATS table_name select
28 delete from mysql.user where user='mysqltest_4';
29 delete from mysql.db where user='mysqltest_4';
30 flush privileges;
31 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 table_schema count(*)
33-information_schema 54
34+information_schema 53
35 mysql 22
36 create table t1 (i int, j int);
37 create trigger trg1 before insert on t1 for each row
38@@ -1335,7 +1334,7 @@
39 INNODB_RSEG rseg_id
40 INNODB_LOCKS lock_id
41 INNODB_BUFFER_POOL_PAGES page_type
42-XTRADB_ENHANCEMENTS name
43+INNODB_TABLE_STATS table_schema
44 INNODB_TRX trx_id
45 XTRADB_ADMIN_COMMAND result_message
46 INNODB_LOCK_WAITS requesting_trx_id
47@@ -1348,7 +1347,6 @@
48 INNODB_SYS_INDEXES TABLE_ID
49 INNODB_BUFFER_POOL_PAGES_BLOB space_id
50 INNODB_CMPMEM_RESET page_size
51-INNODB_TABLE_STATS table_schema
52 SELECT t.table_name, c1.column_name
53 FROM information_schema.tables t
54 INNER JOIN
55@@ -1404,7 +1402,7 @@
56 INNODB_RSEG rseg_id
57 INNODB_LOCKS lock_id
58 INNODB_BUFFER_POOL_PAGES page_type
59-XTRADB_ENHANCEMENTS name
60+INNODB_TABLE_STATS table_schema
61 INNODB_TRX trx_id
62 XTRADB_ADMIN_COMMAND result_message
63 INNODB_LOCK_WAITS requesting_trx_id
64@@ -1417,15 +1415,14 @@
65 INNODB_SYS_INDEXES TABLE_ID
66 INNODB_BUFFER_POOL_PAGES_BLOB space_id
67 INNODB_CMPMEM_RESET page_size
68-INNODB_TABLE_STATS table_schema
69 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
70 MAX(table_name)
71-XTRADB_ENHANCEMENTS
72+XTRADB_ADMIN_COMMAND
73 SELECT table_name from information_schema.tables
74 WHERE table_name=(SELECT MAX(table_name)
75 FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test'));
76 table_name
77-XTRADB_ENHANCEMENTS
78+XTRADB_ADMIN_COMMAND
79 DROP TABLE IF EXISTS bug23037;
80 DROP FUNCTION IF EXISTS get_value;
81 SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
82@@ -1536,7 +1533,6 @@
83 USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
84 USER_STATISTICS information_schema.USER_STATISTICS 1
85 VIEWS information_schema.VIEWS 1
86-XTRADB_ENHANCEMENTS information_schema.XTRADB_ENHANCEMENTS 1
87 create table t1(f1 int);
88 create view v1 as select f1+1 as a from t1;
89 create table t2 (f1 int, f2 int);
90
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 INNODB_RSEG
96 INNODB_LOCKS
97 INNODB_BUFFER_POOL_PAGES
98-XTRADB_ENHANCEMENTS
99+INNODB_TABLE_STATS
100 INNODB_TRX
101 XTRADB_ADMIN_COMMAND
102 INNODB_LOCK_WAITS
103@@ -58,7 +58,6 @@
104 INNODB_SYS_INDEXES
105 INNODB_BUFFER_POOL_PAGES_BLOB
106 INNODB_CMPMEM_RESET
107-INNODB_TABLE_STATS
108 show tables from INFORMATION_SCHEMA like 'T%';
109 Tables_in_information_schema (T%)
110 TABLES
111
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 | INNODB_RSEG |
117 | INNODB_LOCKS |
118 | INNODB_BUFFER_POOL_PAGES |
119-| XTRADB_ENHANCEMENTS |
120+| INNODB_TABLE_STATS |
121 | INNODB_TRX |
122 | XTRADB_ADMIN_COMMAND |
123 | INNODB_LOCK_WAITS |
124@@ -132,7 +132,6 @@
125 | INNODB_SYS_INDEXES |
126 | INNODB_BUFFER_POOL_PAGES_BLOB |
127 | INNODB_CMPMEM_RESET |
128-| INNODB_TABLE_STATS |
129 +---------------------------------------+
130 Database: INFORMATION_SCHEMA
131 +---------------------------------------+
132@@ -178,7 +177,7 @@
133 | INNODB_RSEG |
134 | INNODB_LOCKS |
135 | INNODB_BUFFER_POOL_PAGES |
136-| XTRADB_ENHANCEMENTS |
137+| INNODB_TABLE_STATS |
138 | INNODB_TRX |
139 | XTRADB_ADMIN_COMMAND |
140 | INNODB_LOCK_WAITS |
141@@ -191,7 +190,6 @@
142 | INNODB_SYS_INDEXES |
143 | INNODB_BUFFER_POOL_PAGES_BLOB |
144 | INNODB_CMPMEM_RESET |
145-| INNODB_TABLE_STATS |
146 +---------------------------------------+
147 Wildcard: inf_rmation_schema
148 +--------------------+
149
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 include/ut0vec.h \
155 include/ut0vec.ic \
156 include/ut0wqueue.h \
157- handler/innodb_patch_info.h \
158 mem/mem0dbg.c
159
160 EXTRA_LIBRARIES= libinnobase.a
161
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 i_s_innodb_admin_command,
167 i_s_innodb_sys_tables,
168 i_s_innodb_sys_indexes,
169-i_s_innodb_sys_stats,
170-i_s_innodb_patches
171+i_s_innodb_sys_stats
172 mysql_declare_plugin_end;
173
174 /** @brief Initialize the default value of innodb_commit_concurrency.
175
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 #include <mysys_err.h>
181 #include <my_sys.h>
182 #include "i_s.h"
183-#include "innodb_patch_info.h"
184 #include <mysql/plugin.h>
185
186 extern "C" {
187@@ -224,168 +223,11 @@
188 return(ret);
189 }
190
191-/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_patches */
192-static ST_FIELD_INFO innodb_patches_fields_info[] =
193-{
194-#define IDX_PATCH_NAME 0
195- {STRUCT_FLD(field_name, "name"),
196- STRUCT_FLD(field_length, 255),
197- STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
198- STRUCT_FLD(value, 0),
199- STRUCT_FLD(field_flags, 0),
200- STRUCT_FLD(old_name, ""),
201- STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
202-
203-#define IDX_PATCH_DESCR 1
204- {STRUCT_FLD(field_name, "description"),
205- STRUCT_FLD(field_length, 255),
206- STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
207- STRUCT_FLD(value, 0),
208- STRUCT_FLD(field_flags, 0),
209- STRUCT_FLD(old_name, ""),
210- STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
211-
212-#define IDX_PATCH_COMMENT 2
213- {STRUCT_FLD(field_name, "comment"),
214- STRUCT_FLD(field_length, 100),
215- STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
216- STRUCT_FLD(value, 0),
217- STRUCT_FLD(field_flags, 0),
218- STRUCT_FLD(old_name, ""),
219- STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
220-
221-#define IDX_PATCH_LINK 3
222- {STRUCT_FLD(field_name, "link"),
223- STRUCT_FLD(field_length, 255),
224- STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
225- STRUCT_FLD(value, 0),
226- STRUCT_FLD(field_flags, 0),
227- STRUCT_FLD(old_name, ""),
228- STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
229-
230- END_OF_ST_FIELD_INFO
231-};
232-
233 static struct st_mysql_information_schema i_s_info =
234 {
235 MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
236 };
237
238-/***********************************************************************
239-Fill the dynamic table information_schema.innodb_patches */
240-static
241-int
242-innodb_patches_fill(
243-/*=============*/
244- /* out: 0 on success, 1 on failure */
245- THD* thd, /* in: thread */
246- TABLE_LIST* tables, /* in/out: tables to fill */
247- COND* cond) /* in: condition (ignored) */
248-{
249- TABLE* table = (TABLE *) tables->table;
250- int status = 0;
251- int i;
252- Field** fields;
253-
254-
255- DBUG_ENTER("innodb_patches_fill");
256- fields = table->field;
257-
258- /* deny access to non-superusers */
259- if (check_global_access(thd, PROCESS_ACL)) {
260-
261- DBUG_RETURN(0);
262- }
263-
264- RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name);
265-
266- for (i = 0; innodb_enhancements[i].file; i++) {
267-
268- field_store_string(fields[0],innodb_enhancements[i].file);
269- field_store_string(fields[1],innodb_enhancements[i].name);
270- field_store_string(fields[2],innodb_enhancements[i].comment);
271- field_store_string(fields[3],innodb_enhancements[i].link);
272-
273- if (schema_table_store_record(thd, table)) {
274- status = 1;
275- break;
276- }
277-
278- }
279-
280-
281- DBUG_RETURN(status);
282-}
283-
284-/***********************************************************************
285-Bind the dynamic table information_schema.innodb_patches. */
286-static
287-int
288-innodb_patches_init(
289-/*=========*/
290- /* out: 0 on success */
291- void* p) /* in/out: table schema object */
292-{
293- DBUG_ENTER("innodb_patches_init");
294- ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p;
295-
296- schema->fields_info = innodb_patches_fields_info;
297- schema->fill_table = innodb_patches_fill;
298-
299- DBUG_RETURN(0);
300-}
301-
302-
303-UNIV_INTERN struct st_mysql_plugin i_s_innodb_patches =
304-{
305- /* the plugin type (a MYSQL_XXX_PLUGIN value) */
306- /* int */
307- STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
308-
309- /* pointer to type-specific plugin descriptor */
310- /* void* */
311- STRUCT_FLD(info, &i_s_info),
312-
313- /* plugin name */
314- /* const char* */
315- STRUCT_FLD(name, "XTRADB_ENHANCEMENTS"),
316-
317- /* plugin author (for SHOW PLUGINS) */
318- /* const char* */
319- STRUCT_FLD(author, "Percona"),
320-
321- /* general descriptive text (for SHOW PLUGINS) */
322- /* const char* */
323- STRUCT_FLD(descr, "Enhancements applied to InnoDB plugin"),
324-
325- /* the plugin license (PLUGIN_LICENSE_XXX) */
326- /* int */
327- STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
328-
329- /* the function to invoke when plugin is loaded */
330- /* int (*)(void*); */
331- STRUCT_FLD(init, innodb_patches_init),
332-
333- /* the function to invoke when plugin is unloaded */
334- /* int (*)(void*); */
335- STRUCT_FLD(deinit, i_s_common_deinit),
336-
337- /* plugin version (for SHOW PLUGINS) */
338- /* unsigned int */
339- STRUCT_FLD(version, INNODB_VERSION_SHORT),
340-
341- /* struct st_mysql_show_var* */
342- STRUCT_FLD(status_vars, NULL),
343-
344- /* struct st_mysql_sys_var** */
345- STRUCT_FLD(system_vars, NULL),
346-
347- /* reserved for dependency checking */
348- /* void* */
349- STRUCT_FLD(__reserved1, NULL)
350-};
351-
352-
353 static ST_FIELD_INFO i_s_innodb_buffer_pool_pages_fields_info[] =
354 {
355 {STRUCT_FLD(field_name, "page_type"),
356
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 extern struct st_mysql_plugin i_s_innodb_cmp_reset;
362 extern struct st_mysql_plugin i_s_innodb_cmpmem;
363 extern struct st_mysql_plugin i_s_innodb_cmpmem_reset;
364-extern struct st_mysql_plugin i_s_innodb_patches;
365 extern struct st_mysql_plugin i_s_innodb_rseg;
366 extern struct st_mysql_plugin i_s_innodb_table_stats;
367 extern struct st_mysql_plugin i_s_innodb_index_stats;
368
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-/* Copyright (C) 2002-2006 MySQL AB
374-
375- This program is free software; you can redistribute it and/or modify
376- it under the terms of the GNU General Public License as published by
377- the Free Software Foundation; version 2 of the License.
378-
379- This program is distributed in the hope that it will be useful,
380- but WITHOUT ANY WARRANTY; without even the implied warranty of
381- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
382- GNU General Public License for more details.
383-
384- You should have received a copy of the GNU General Public License
385- along with this program; if not, write to the Free Software
386- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
387-
388-#ifdef USE_PRAGMA_INTERFACE
389-#pragma interface /* gcc class implementation */
390-#endif
391-
392-struct innodb_enhancement {
393- const char *file;
394- const char *name;
395- const char *comment;
396- const char *link;
397-}innodb_enhancements[] = {
398-{"xtradb_show_enhancements","I_S.XTRADB_ENHANCEMENTS","","http://www.percona.com/docs/wiki/percona-xtradb"},
399-{"innodb_show_status","Improvements to SHOW INNODB STATUS","Memory information and lock info fixes","http://www.percona.com/docs/wiki/percona-xtradb"},
400-{"innodb_io","Improvements to InnoDB IO","","http://www.percona.com/docs/wiki/percona-xtradb"},
401-{"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-{"innodb_buffer_pool_pages","Information of buffer pool content","","http://www.percona.com/docs/wiki/percona-xtradb"},
403-{"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-{"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-{"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-{"innodb_thread_concurrency_timer_based","use InnoDB timer based concurrency throttling (backport from MySQL 5.4.0)","",""},
407-{"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-{"innodb_dict_size_limit","Limit dictionary cache size","Variable innodb_dict_size_limit in bytes","http://www.percona.com/docs/wiki/percona-xtradb"},
409-{"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-{"innodb_stats","Additional features about InnoDB statistics/optimizer","","http://www.percona.com/docs/wiki/percona-xtradb"},
411-{"innodb_recovery_patches","Bugfixes and adjustments about recovery process","","http://www.percona.com/docs/wiki/percona-xtradb"},
412-{"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},
413-{"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},
414-{"innodb_show_lock_name","Show mutex/lock name instead of crated file/line","","http://www.percona.com/docs/wiki/percona-xtradb"},
415-{"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-{"innodb_lru_dump_restore","Dump and restore command for content of buffer pool","","http://www.percona.com/docs/wiki/percona-xtradb"},
417-{"innodb_separate_doublewrite","Add option 'innodb_doublewrite_file' to separate doublewrite dedicated tablespace","","http://www.percona.com/docs/wiki/percona-xtradb"},
418-{"innodb_pass_corrupt_table","Treat tables as corrupt instead of crash, when meet corrupt blocks","","http://www.percona.com/docs/wiki/percona-xtradb"},
419-{"innodb_fast_checksum","Using the checksum on 32bit-unit calculation","incompatible for unpatched ver.","http://www.percona.com/docs/wiki/percona-xtradb"},
420-{"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-{"innodb_sys_tables_sys_indexes","Expose InnoDB SYS_TABLES and SYS_INDEXES schema tables","","http://www.percona.com/docs/wiki/percona-xtradb"},
422-{NULL, NULL, NULL, NULL}
423-};

Subscribers

People subscribed via source and target branches