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

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

  1. bug892951
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 235
Proposed branch: lp:~laurynas-biveinis/percona-server/bug892951
Merge into: lp:percona-server/5.5
Diff against target: 211 lines (+26/-22)
1 file modified
patches/memory_dynamic_rows.patch (+26/-22)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug892951
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+99877@code.launchpad.net

Description of the change

Fix bug 892951 (Non-deterministic percona_heap_blob test failure).

Use a case-sensitive collation instead of the default case-insensitive
one where the order of rows returned by SELECT must be resolved by
case-sensitiveness too.

Jenkins:
http://jenkins.percona.com/job/percona-server-5.5-param/311/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
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 2012-01-06 08:28:40 +0000
+++ patches/memory_dynamic_rows.patch 2012-03-29 06:13:23 +0000
@@ -2812,7 +2812,7 @@
2812 } /* heap_update */2812 } /* heap_update */
2813--- /dev/null2813--- /dev/null
2814+++ b/mysql-test/r/percona_heap_blob.result2814+++ b/mysql-test/r/percona_heap_blob.result
2815@@ -0,0 +1,952 @@2815@@ -0,0 +1,956 @@
2816+SET @old_default_storage_engine=@@default_storage_engine;2816+SET @old_default_storage_engine=@@default_storage_engine;
2817+SET default_storage_engine=MEMORY;2817+SET default_storage_engine=MEMORY;
2818+drop table if exists t1,t2,t3,t4,t5,t6,t7;2818+drop table if exists t1,t2,t3,t4,t5,t6,t7;
@@ -2884,7 +2884,7 @@
2884+a2884+a
2885+Where2885+Where
2886+drop table t1;2886+drop table t1;
2887+create table t1 (t text,c char(10),b blob, d varbinary(10));2887+create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
2888+insert into t1 values (NULL,NULL,NULL,NULL);2888+insert into t1 values (NULL,NULL,NULL,NULL);
2889+insert into t1 values ("","","","");2889+insert into t1 values ("","","","");
2890+insert into t1 values ("hello","hello","hello","hello");2890+insert into t1 values ("hello","hello","hello","hello");
@@ -2897,26 +2897,24 @@
2897+lock tables t1 READ;2897+lock tables t1 READ;
2898+show full fields from t1;2898+show full fields from t1;
2899+Field Type Collation Null Key Default Extra Privileges Comment2899+Field Type Collation Null Key Default Extra Privileges Comment
2900+t text latin1_swedish_ci YES NULL # 2900+t text latin1_general_cs YES NULL #
2901+c char(10) latin1_swedish_ci YES NULL # 2901+c char(10) latin1_general_cs YES NULL #
2902+b blob NULL YES NULL # 2902+b blob NULL YES NULL #
2903+d varbinary(10) NULL YES NULL # 2903+d varbinary(10) NULL YES NULL #
2904+lock tables t1 WRITE;2904+lock tables t1 WRITE;
2905+show full fields from t1;2905+show full fields from t1;
2906+Field Type Collation Null Key Default Extra Privileges Comment2906+Field Type Collation Null Key Default Extra Privileges Comment
2907+t text latin1_swedish_ci YES NULL # 2907+t text latin1_general_cs YES NULL #
2908+c char(10) latin1_swedish_ci YES NULL # 2908+c char(10) latin1_general_cs YES NULL #
2909+b blob NULL YES NULL # 2909+b blob NULL YES NULL #
2910+d varbinary(10) NULL YES NULL # 2910+d varbinary(10) NULL YES NULL #
2911+unlock tables;2911+unlock tables;
2912+select t from t1 where t like "hello";2912+select t from t1 where t like "hello";
2913+t2913+t
2914+hello2914+hello
2915+HELLO
2916+select c from t1 where c like "hello";2915+select c from t1 where c like "hello";
2917+c2916+c
2918+hello2917+hello
2919+HELLO
2920+select b from t1 where b like "hello";2918+select b from t1 where b like "hello";
2921+b2919+b
2922+hello2920+hello
@@ -2926,18 +2924,15 @@
2926+select c from t1 having c like "hello";2924+select c from t1 having c like "hello";
2927+c2925+c
2928+hello2926+hello
2929+HELLO
2930+select d from t1 having d like "hello";2927+select d from t1 having d like "hello";
2931+d2928+d
2932+hello2929+hello
2933+select t from t1 where t like "%HELLO%";2930+select t from t1 where t like "%HELLO%";
2934+t2931+t
2935+hello
2936+HELLO2932+HELLO
2937+HELLO MY2933+HELLO MY
2938+select c from t1 where c like "%HELLO%";2934+select c from t1 where c like "%HELLO%";
2939+c2935+c
2940+hello
2941+HELLO2936+HELLO
2942+HELLO MY2937+HELLO MY
2943+select b from t1 where b like "%HELLO%";2938+select b from t1 where b like "%HELLO%";
@@ -2950,7 +2945,6 @@
2950+HELLO MY2945+HELLO MY
2951+select c from t1 having c like "%HELLO%";2946+select c from t1 having c like "%HELLO%";
2952+c2947+c
2953+hello
2954+HELLO2948+HELLO
2955+HELLO MY2949+HELLO MY
2956+select d from t1 having d like "%HELLO%";2950+select d from t1 having d like "%HELLO%";
@@ -2968,9 +2962,9 @@
2968+2962+
2969+12963+1
2970+a2964+a
2971+hello
2972+HELLO2965+HELLO
2973+HELLO MY2966+HELLO MY
2967+hello
2974+select c from t1 order by c;2968+select c from t1 order by c;
2975+c2969+c
2976+NULL2970+NULL
@@ -2978,9 +2972,9 @@
2978+2972+
2979+2973+
2980+a2974+a
2981+hello
2982+HELLO2975+HELLO
2983+HELLO MY2976+HELLO MY
2977+hello
2984+select b from t1 order by b;2978+select b from t1 order by b;
2985+b2979+b
2986+NULL2980+NULL
@@ -3006,6 +3000,7 @@
3006+NULL3000+NULL
3007+3001+
3008+hello3002+hello
3003+HELLO
3009+HELLO MY3004+HELLO MY
3010+a3005+a
3011+13006+1
@@ -3023,8 +3018,9 @@
3023+3018+
3024+13019+1
3025+a3020+a
3021+HELLO
3022+HELLO MY
3026+hello3023+hello
3027+HELLO MY
3028+select distinct b from t1 order by b;3024+select distinct b from t1 order by b;
3029+b3025+b
3030+NULL3026+NULL
@@ -3039,8 +3035,9 @@
3039+3035+
3040+13036+1
3041+a3037+a
3038+HELLO
3039+HELLO MY
3042+hello3040+hello
3043+HELLO MY
3044+select b from t1 group by b;3041+select b from t1 group by b;
3045+b3042+b
3046+NULL3043+NULL
@@ -3055,6 +3052,7 @@
3055+NULL3052+NULL
3056+3053+
3057+hello3054+hello
3055+HELLO
3058+HELLO MY3056+HELLO MY
3059+a3057+a
3060+13058+1
@@ -3072,8 +3070,9 @@
3072+3070+
3073+13071+1
3074+a3072+a
3073+HELLO
3074+HELLO MY
3075+hello3075+hello
3076+HELLO MY
3077+select distinct b from t1 order by b;3076+select distinct b from t1 order by b;
3078+b3077+b
3079+NULL3078+NULL
@@ -3087,6 +3086,7 @@
3087+NULL3086+NULL
3088+3087+
3089+hello3088+hello
3089+HELLO
3090+HELLO MY3090+HELLO MY
3091+a3091+a
3092+select distinct d from t1;3092+select distinct d from t1;
@@ -3103,8 +3103,9 @@
3103+NULL3103+NULL
3104+3104+
3105+a3105+a
3106+HELLO
3107+HELLO MY
3106+hello3108+hello
3107+HELLO MY
3108+select distinct d from t1 order by d;3109+select distinct d from t1 order by d;
3109+d3110+d
3110+NULL3111+NULL
@@ -3119,8 +3120,9 @@
3119+NULL3120+NULL
3120+3121+
3121+a3122+a
3123+HELLO
3124+HELLO MY
3122+hello3125+hello
3123+HELLO MY
3124+select d from t1 group by d;3126+select d from t1 group by d;
3125+d3127+d
3126+NULL3128+NULL
@@ -3146,8 +3148,9 @@
3146+ 13148+ 1
3147+1 13149+1 1
3148+a 13150+a 1
3149+hello 23151+HELLO 1
3150+HELLO MY 13152+HELLO MY 1
3153+hello 1
3151+select b,count(*) from t1 group by b;3154+select b,count(*) from t1 group by b;
3152+b count(*)3155+b count(*)
3153+NULL 33156+NULL 3
@@ -3161,8 +3164,9 @@
3161+NULL 23164+NULL 2
3162+ 23165+ 2
3163+a 13166+a 1
3164+hello 23167+HELLO 1
3165+HELLO MY 13168+HELLO MY 1
3169+hello 1
3166+select d,count(*) from t1 group by d;3170+select d,count(*) from t1 group by d;
3167+d count(*)3171+d count(*)
3168+NULL 23172+NULL 2
@@ -4369,7 +4373,7 @@
4369+#4373+#
4370+# test of blob, text, char and varbinary4374+# test of blob, text, char and varbinary
4371+#4375+#
4372+create table t1 (t text,c char(10),b blob, d varbinary(10));4376+create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
4373+insert into t1 values (NULL,NULL,NULL,NULL);4377+insert into t1 values (NULL,NULL,NULL,NULL);
4374+insert into t1 values ("","","","");4378+insert into t1 values ("","","","");
4375+insert into t1 values ("hello","hello","hello","hello");4379+insert into t1 values ("hello","hello","hello","hello");

Subscribers

People subscribed via source and target branches