Merge lp:~percona-dev/percona-server/5.1.57-fix_bug627189 into lp:~percona-dev/percona-server/5.1.57

Proposed by Yasufumi Kinoshita on 2011-06-03
Status: Merged
Approved by: Stewart Smith on 2011-06-05
Approved revision: 232
Merged at revision: 232
Proposed branch: lp:~percona-dev/percona-server/5.1.57-fix_bug627189
Merge into: lp:~percona-dev/percona-server/5.1.57
Diff against target: 74 lines (+13/-24)
1 file modified
innodb_show_sys_tables.patch (+13/-24)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1.57-fix_bug627189
Reviewer Review Type Date Requested Status
Stewart Smith (community) code 2011-06-03 Approve on 2011-06-05
Vadim Tkachenko 2011-06-03 Abstain on 2011-06-03
Review via email: mp+63346@code.launchpad.net
To post a comment you must log in.
Vadim Tkachenko (vadim-tk) wrote :

I assign it to stewart, the feature should have test and documentation

review: Abstain
Stewart Smith (stewart) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innodb_show_sys_tables.patch'
2--- innodb_show_sys_tables.patch 2011-05-23 03:13:45 +0000
3+++ innodb_show_sys_tables.patch 2011-06-03 09:24:31 +0000
4@@ -29,7 +29,7 @@
5 #include "buf0lru.h" /* for XTRA_LRU_[DUMP/RESTORE] */
6 }
7
8-@@ -3111,6 +3112,685 @@
9+@@ -3111,6 +3112,674 @@
10 STRUCT_FLD(deinit, i_s_common_deinit),
11 STRUCT_FLD(version, 0x0100 /* 1.0 */),
12 STRUCT_FLD(status_vars, NULL),
13@@ -572,15 +572,14 @@
14 + rec = btr_pcur_get_rec(&pcur);
15 + if (!btr_pcur_is_on_user_rec(&pcur)) {
16 + /* end of index */
17-+ btr_pcur_close(&pcur);
18-+ mtr_commit(&mtr);
19 + break;
20 + }
21++
22++ btr_pcur_store_position(&pcur, &mtr);
23++
24 + if (rec_get_deleted_flag(rec, 0)) {
25 + /* record marked as deleted */
26-+ btr_pcur_close(&pcur);
27-+ mtr_commit(&mtr);
28-+ continue;
29++ goto next_record;
30 + }
31 +
32 + if (id == 0) {
33@@ -591,33 +590,23 @@
34 + status = copy_sys_stats_rec(table, index, rec);
35 + }
36 + if (status) {
37-+ btr_pcur_close(&pcur);
38-+ mtr_commit(&mtr);
39 + break;
40 + }
41 +
42-+#if 0
43-+ btr_pcur_store_position(&pcur, &mtr);
44++ status = schema_table_store_record(thd, table);
45++ if (status) {
46++ break;
47++ }
48++next_record:
49 + mtr_commit(&mtr);
50 +
51-+ status = schema_table_store_record(thd, table);
52-+ if (status) {
53-+ btr_pcur_close(&pcur);
54-+ break;
55-+ }
56-+
57 + mtr_start(&mtr);
58 + btr_pcur_restore_position(BTR_SEARCH_LEAF, &pcur, &mtr);
59-+#else
60-+ status = schema_table_store_record(thd, table);
61-+ if (status) {
62-+ btr_pcur_close(&pcur);
63-+ mtr_commit(&mtr);
64-+ break;
65-+ }
66-+#endif
67 + }
68 +
69++ btr_pcur_close(&pcur);
70++ mtr_commit(&mtr);
71++
72 + mutex_exit(&(dict_sys->mutex));
73 +
74 + DBUG_RETURN(status);

Subscribers

People subscribed via source and target branches