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

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 231
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.
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 'patches/memory_dynamic_rows.patch'
2--- patches/memory_dynamic_rows.patch 2012-01-06 08:28:40 +0000
3+++ patches/memory_dynamic_rows.patch 2012-03-29 06:13:23 +0000
4@@ -2812,7 +2812,7 @@
5 } /* heap_update */
6 --- /dev/null
7 +++ b/mysql-test/r/percona_heap_blob.result
8-@@ -0,0 +1,952 @@
9+@@ -0,0 +1,956 @@
10 +SET @old_default_storage_engine=@@default_storage_engine;
11 +SET default_storage_engine=MEMORY;
12 +drop table if exists t1,t2,t3,t4,t5,t6,t7;
13@@ -2884,7 +2884,7 @@
14 +a
15 +Where
16 +drop table t1;
17-+create table t1 (t text,c char(10),b blob, d varbinary(10));
18++create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
19 +insert into t1 values (NULL,NULL,NULL,NULL);
20 +insert into t1 values ("","","","");
21 +insert into t1 values ("hello","hello","hello","hello");
22@@ -2897,26 +2897,24 @@
23 +lock tables t1 READ;
24 +show full fields from t1;
25 +Field Type Collation Null Key Default Extra Privileges Comment
26-+t text latin1_swedish_ci YES NULL #
27-+c char(10) latin1_swedish_ci YES NULL #
28++t text latin1_general_cs YES NULL #
29++c char(10) latin1_general_cs YES NULL #
30 +b blob NULL YES NULL #
31 +d varbinary(10) NULL YES NULL #
32 +lock tables t1 WRITE;
33 +show full fields from t1;
34 +Field Type Collation Null Key Default Extra Privileges Comment
35-+t text latin1_swedish_ci YES NULL #
36-+c char(10) latin1_swedish_ci YES NULL #
37++t text latin1_general_cs YES NULL #
38++c char(10) latin1_general_cs YES NULL #
39 +b blob NULL YES NULL #
40 +d varbinary(10) NULL YES NULL #
41 +unlock tables;
42 +select t from t1 where t like "hello";
43 +t
44 +hello
45-+HELLO
46 +select c from t1 where c like "hello";
47 +c
48 +hello
49-+HELLO
50 +select b from t1 where b like "hello";
51 +b
52 +hello
53@@ -2926,18 +2924,15 @@
54 +select c from t1 having c like "hello";
55 +c
56 +hello
57-+HELLO
58 +select d from t1 having d like "hello";
59 +d
60 +hello
61 +select t from t1 where t like "%HELLO%";
62 +t
63-+hello
64 +HELLO
65 +HELLO MY
66 +select c from t1 where c like "%HELLO%";
67 +c
68-+hello
69 +HELLO
70 +HELLO MY
71 +select b from t1 where b like "%HELLO%";
72@@ -2950,7 +2945,6 @@
73 +HELLO MY
74 +select c from t1 having c like "%HELLO%";
75 +c
76-+hello
77 +HELLO
78 +HELLO MY
79 +select d from t1 having d like "%HELLO%";
80@@ -2968,9 +2962,9 @@
81 +
82 +1
83 +a
84-+hello
85 +HELLO
86 +HELLO MY
87++hello
88 +select c from t1 order by c;
89 +c
90 +NULL
91@@ -2978,9 +2972,9 @@
92 +
93 +
94 +a
95-+hello
96 +HELLO
97 +HELLO MY
98++hello
99 +select b from t1 order by b;
100 +b
101 +NULL
102@@ -3006,6 +3000,7 @@
103 +NULL
104 +
105 +hello
106++HELLO
107 +HELLO MY
108 +a
109 +1
110@@ -3023,8 +3018,9 @@
111 +
112 +1
113 +a
114++HELLO
115++HELLO MY
116 +hello
117-+HELLO MY
118 +select distinct b from t1 order by b;
119 +b
120 +NULL
121@@ -3039,8 +3035,9 @@
122 +
123 +1
124 +a
125++HELLO
126++HELLO MY
127 +hello
128-+HELLO MY
129 +select b from t1 group by b;
130 +b
131 +NULL
132@@ -3055,6 +3052,7 @@
133 +NULL
134 +
135 +hello
136++HELLO
137 +HELLO MY
138 +a
139 +1
140@@ -3072,8 +3070,9 @@
141 +
142 +1
143 +a
144++HELLO
145++HELLO MY
146 +hello
147-+HELLO MY
148 +select distinct b from t1 order by b;
149 +b
150 +NULL
151@@ -3087,6 +3086,7 @@
152 +NULL
153 +
154 +hello
155++HELLO
156 +HELLO MY
157 +a
158 +select distinct d from t1;
159@@ -3103,8 +3103,9 @@
160 +NULL
161 +
162 +a
163++HELLO
164++HELLO MY
165 +hello
166-+HELLO MY
167 +select distinct d from t1 order by d;
168 +d
169 +NULL
170@@ -3119,8 +3120,9 @@
171 +NULL
172 +
173 +a
174++HELLO
175++HELLO MY
176 +hello
177-+HELLO MY
178 +select d from t1 group by d;
179 +d
180 +NULL
181@@ -3146,8 +3148,9 @@
182 + 1
183 +1 1
184 +a 1
185-+hello 2
186++HELLO 1
187 +HELLO MY 1
188++hello 1
189 +select b,count(*) from t1 group by b;
190 +b count(*)
191 +NULL 3
192@@ -3161,8 +3164,9 @@
193 +NULL 2
194 + 2
195 +a 1
196-+hello 2
197++HELLO 1
198 +HELLO MY 1
199++hello 1
200 +select d,count(*) from t1 group by d;
201 +d count(*)
202 +NULL 2
203@@ -4369,7 +4373,7 @@
204 +#
205 +# test of blob, text, char and varbinary
206 +#
207-+create table t1 (t text,c char(10),b blob, d varbinary(10));
208++create table t1 (t text,c char(10),b blob, d varbinary(10)) collate latin1_general_cs;
209 +insert into t1 values (NULL,NULL,NULL,NULL);
210 +insert into t1 values ("","","","");
211 +insert into t1 values ("hello","hello","hello","hello");

Subscribers

People subscribed via source and target branches