Merge lp:~laurynas-biveinis/percona-server/bug849921 into lp:percona-server/5.5

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: 203
Merged at revision: 203
Proposed branch: lp:~laurynas-biveinis/percona-server/bug849921
Merge into: lp:percona-server/5.5
Diff against target: 69 lines (+6/-6)
1 file modified
patches/memory_dynamic_rows.patch (+6/-6)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug849921
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+87713@code.launchpad.net

Description of the change

Fix bug 849921: a typo that caused MyISAM to be used instead of MEMORY
for one of the test tables in percona_heap_blob test.

Fix is to remove engine specifications from all create table
statements and make sure that default_storage_engine is MEMORY during
the whole test.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Jenkins-tested ages ago with good results.

Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/memory_dynamic_rows.patch'
2--- patches/memory_dynamic_rows.patch 2011-12-13 15:06:50 +0000
3+++ patches/memory_dynamic_rows.patch 2012-01-06 08:54:24 +0000
4@@ -3726,13 +3726,12 @@
5 +2
6 +DROP FUNCTION f1;
7 +DROP TABLE t1;
8-+SET default_storage_engine=@old_default_storage_engine;
9 +SET @old_max_heap_table_size = @@global.max_heap_table_size;
10 +SET @old_max_allowed_packet = @@global.max_allowed_packet;
11 +SET GLOBAL max_heap_table_size = 18 * 1024 * 1024;
12 +SET GLOBAL max_allowed_packet = 24 * 1024 * 1024;
13 +drop table if exists t1;
14-+CREATE TABLE t1 (data LONGBLOB) ENGINE=memory;
15++CREATE TABLE t1 (data LONGBLOB);
16 +INSERT INTO t1 (data) VALUES (NULL);
17 +UPDATE t1 set data=repeat('a',18*1024*1024);
18 +select length(data) from t1;
19@@ -3754,7 +3753,7 @@
20 +length(data)
21 +0
22 +drop table t1;
23-+CREATE TABLE t1 (data BLOB) ENGINE=myisam;
24++CREATE TABLE t1 (data BLOB);
25 +INSERT INTO t1 (data) VALUES (NULL);
26 +UPDATE t1 set data=repeat('a',18*1024*1024);
27 +Warnings:
28@@ -3765,6 +3764,7 @@
29 +drop table t1;
30 +SET GLOBAL max_allowed_packet = @old_max_allowed_packet;
31 +SET GLOBAL max_heap_table_size = @old_max_heap_table_size;
32++SET default_storage_engine=@old_default_storage_engine;
33 --- /dev/null
34 +++ b/mysql-test/r/percona_heap_bug783366.result
35 @@ -0,0 +1,14 @@
36@@ -4879,7 +4879,6 @@
37 +
38 +
39 +
40-+SET default_storage_engine=@old_default_storage_engine;
41 +
42 +
43 +########################################################################
44@@ -4900,7 +4899,7 @@
45 +
46 +# Bug #2159 (Problem with update of blob to > 16M)
47 +
48-+CREATE TABLE t1 (data LONGBLOB) ENGINE=memory;
49++CREATE TABLE t1 (data LONGBLOB);
50 +INSERT INTO t1 (data) VALUES (NULL);
51 +UPDATE t1 set data=repeat('a',18*1024*1024);
52 +select length(data) from t1;
53@@ -4922,7 +4921,7 @@
54 +select length(data) from t1;
55 +drop table t1;
56 +
57-+CREATE TABLE t1 (data BLOB) ENGINE=myisam;
58++CREATE TABLE t1 (data BLOB);
59 +INSERT INTO t1 (data) VALUES (NULL);
60 +UPDATE t1 set data=repeat('a',18*1024*1024);
61 +select length(data) from t1;
62@@ -4933,6 +4932,7 @@
63 +
64 +SET GLOBAL max_allowed_packet = @old_max_allowed_packet;
65 +SET GLOBAL max_heap_table_size = @old_max_heap_table_size;
66++SET default_storage_engine=@old_default_storage_engine;
67 --- /dev/null
68 +++ b/mysql-test/t/percona_heap_bug783366.test
69 @@ -0,0 +1,19 @@

Subscribers

People subscribed via source and target branches