Merge lp:~tplavcic/percona-server/bug1329772-5.6 into lp:percona-server/5.6

Proposed by Tomislav Plavcic on 2014-06-23
Status: Merged
Approved by: Alexey Kopytov on 2014-06-24
Approved revision: 615
Merged at revision: 615
Proposed branch: lp:~tplavcic/percona-server/bug1329772-5.6
Merge into: lp:percona-server/5.6
Diff against target: 14 lines (+1/-1)
1 file modified
sql/handler.h (+1/-1)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1329772-5.6
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-06-23 Approve on 2014-06-24
Review via email: mp+224222@code.launchpad.net

Description of the change

Fixes position of DB_TYPE_TOKUDB in sql/handler.h which made problems with performance schema
Testing was done with following packages:
http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.6-RELEASE/52/

To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/handler.h'
2--- sql/handler.h 2014-06-23 11:28:56 +0000
3+++ sql/handler.h 2014-06-23 22:18:36 +0000
4@@ -395,9 +395,9 @@
5 DB_TYPE_MEMCACHE,
6 DB_TYPE_FALCON,
7 DB_TYPE_MARIA,
8- DB_TYPE_TOKUDB=41,
9 /** Performance schema engine. */
10 DB_TYPE_PERFORMANCE_SCHEMA,
11+ DB_TYPE_TOKUDB=41,
12 DB_TYPE_FIRST_DYNAMIC=42,
13 DB_TYPE_DEFAULT=127 // Must be last
14 };

Subscribers

People subscribed via source and target branches