Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug849921
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
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
=== modified file 'patches/memory_dynamic_rows.patch'
--- patches/memory_dynamic_rows.patch 2011-12-13 15:06:50 +0000
+++ patches/memory_dynamic_rows.patch 2012-01-06 08:54:24 +0000
@@ -3726,13 +3726,12 @@
3726+23726+2
3727+DROP FUNCTION f1;3727+DROP FUNCTION f1;
3728+DROP TABLE t1;3728+DROP TABLE t1;
3729+SET default_storage_engine=@old_default_storage_engine;
3730+SET @old_max_heap_table_size = @@global.max_heap_table_size;3729+SET @old_max_heap_table_size = @@global.max_heap_table_size;
3731+SET @old_max_allowed_packet = @@global.max_allowed_packet;3730+SET @old_max_allowed_packet = @@global.max_allowed_packet;
3732+SET GLOBAL max_heap_table_size = 18 * 1024 * 1024;3731+SET GLOBAL max_heap_table_size = 18 * 1024 * 1024;
3733+SET GLOBAL max_allowed_packet = 24 * 1024 * 1024;3732+SET GLOBAL max_allowed_packet = 24 * 1024 * 1024;
3734+drop table if exists t1;3733+drop table if exists t1;
3735+CREATE TABLE t1 (data LONGBLOB) ENGINE=memory;3734+CREATE TABLE t1 (data LONGBLOB);
3736+INSERT INTO t1 (data) VALUES (NULL);3735+INSERT INTO t1 (data) VALUES (NULL);
3737+UPDATE t1 set data=repeat('a',18*1024*1024);3736+UPDATE t1 set data=repeat('a',18*1024*1024);
3738+select length(data) from t1;3737+select length(data) from t1;
@@ -3754,7 +3753,7 @@
3754+length(data)3753+length(data)
3755+03754+0
3756+drop table t1;3755+drop table t1;
3757+CREATE TABLE t1 (data BLOB) ENGINE=myisam;3756+CREATE TABLE t1 (data BLOB);
3758+INSERT INTO t1 (data) VALUES (NULL);3757+INSERT INTO t1 (data) VALUES (NULL);
3759+UPDATE t1 set data=repeat('a',18*1024*1024);3758+UPDATE t1 set data=repeat('a',18*1024*1024);
3760+Warnings:3759+Warnings:
@@ -3765,6 +3764,7 @@
3765+drop table t1;3764+drop table t1;
3766+SET GLOBAL max_allowed_packet = @old_max_allowed_packet;3765+SET GLOBAL max_allowed_packet = @old_max_allowed_packet;
3767+SET GLOBAL max_heap_table_size = @old_max_heap_table_size;3766+SET GLOBAL max_heap_table_size = @old_max_heap_table_size;
3767+SET default_storage_engine=@old_default_storage_engine;
3768--- /dev/null3768--- /dev/null
3769+++ b/mysql-test/r/percona_heap_bug783366.result3769+++ b/mysql-test/r/percona_heap_bug783366.result
3770@@ -0,0 +1,14 @@3770@@ -0,0 +1,14 @@
@@ -4879,7 +4879,6 @@
4879+4879+
4880+4880+
4881+4881+
4882+SET default_storage_engine=@old_default_storage_engine;
4883+4882+
4884+4883+
4885+########################################################################4884+########################################################################
@@ -4900,7 +4899,7 @@
4900+4899+
4901+# Bug #2159 (Problem with update of blob to > 16M)4900+# Bug #2159 (Problem with update of blob to > 16M)
4902+4901+
4903+CREATE TABLE t1 (data LONGBLOB) ENGINE=memory;4902+CREATE TABLE t1 (data LONGBLOB);
4904+INSERT INTO t1 (data) VALUES (NULL);4903+INSERT INTO t1 (data) VALUES (NULL);
4905+UPDATE t1 set data=repeat('a',18*1024*1024);4904+UPDATE t1 set data=repeat('a',18*1024*1024);
4906+select length(data) from t1;4905+select length(data) from t1;
@@ -4922,7 +4921,7 @@
4922+select length(data) from t1;4921+select length(data) from t1;
4923+drop table t1;4922+drop table t1;
4924+4923+
4925+CREATE TABLE t1 (data BLOB) ENGINE=myisam;4924+CREATE TABLE t1 (data BLOB);
4926+INSERT INTO t1 (data) VALUES (NULL);4925+INSERT INTO t1 (data) VALUES (NULL);
4927+UPDATE t1 set data=repeat('a',18*1024*1024);4926+UPDATE t1 set data=repeat('a',18*1024*1024);
4928+select length(data) from t1;4927+select length(data) from t1;
@@ -4933,6 +4932,7 @@
4933+4932+
4934+SET GLOBAL max_allowed_packet = @old_max_allowed_packet;4933+SET GLOBAL max_allowed_packet = @old_max_allowed_packet;
4935+SET GLOBAL max_heap_table_size = @old_max_heap_table_size;4934+SET GLOBAL max_heap_table_size = @old_max_heap_table_size;
4935+SET default_storage_engine=@old_default_storage_engine;
4936--- /dev/null4936--- /dev/null
4937+++ b/mysql-test/t/percona_heap_bug783366.test4937+++ b/mysql-test/t/percona_heap_bug783366.test
4938@@ -0,0 +1,19 @@4938@@ -0,0 +1,19 @@

Subscribers

People subscribed via source and target branches