Merge lp:~tsarev/percona-server/5.1_fix_bug_832528 into lp:percona-server/5.1

Proposed by Oleg Tsarev on 2011-10-08
Status: Merged
Approved by: Stewart Smith on 2011-10-08
Approved revision: 323
Merged at revision: 322
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_832528
Merge into: lp:percona-server/5.1
Prerequisite: lp:~tsarev/percona-server/5.1_fix_bug_838725_base
Diff against target: 70 lines (+63/-0)
1 file modified
patches/bug53761.patch (+63/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_832528
Reviewer Review Type Date Requested Status
Laurynas Biveinis 2011-10-08 Approve on 2011-10-08
Review via email: mp+78687@code.launchpad.net

This proposal supersedes a proposal from 2011-10-08.

Description of the change

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

PREREQUISITE BRANCH: https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_838725_base/+merge/78683

FAILED TESTS:
1. main.percona_innodb_kill_idle_trx main.percona_innodb_kill_idle_trx_locks
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691

2. main.percona_server_variables_debug main.percona_server_variables_release
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_860416/+merge/78692

FAILED TESTCASES (JUST DEBUG):
1. rpl.rpl_binlog_errors
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_794790/+merge/78694

DESCRIPTION:
  Fixed tests main.index_merge_innodb, main.rowid_order_innodb, main.type_bit_innodb, main.endspace broken on revision number 279 (bug #832528) (according to bug #838725 tests doesn't run on revision number 279)

To post a comment you must log in.

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/bug53761.patch'
2--- patches/bug53761.patch 2011-08-24 11:40:25 +0000
3+++ patches/bug53761.patch 2011-10-08 00:51:24 +0000
4@@ -407,3 +407,66 @@
5 SELECT COUNT(*) FROM
6 (SELECT * FROM t1 FORCE INDEX (idx,PRIMARY)
7 WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t;
8+--- a/mysql-test/r/index_merge_innodb.result
9++++ b/mysql-test/r/index_merge_innodb.result
10+@@ -346,7 +346,7 @@
11+ FROM t1
12+ WHERE c = 1 AND b = 1 AND d = 1;
13+ id select_type table type possible_keys key key_len ref rows Extra
14+-1 SIMPLE t1 index_merge c,bd c,bd 5,10 NULL 1 Using intersect(c,bd); Using where; Using index
15++1 SIMPLE t1 ref c,bd bd 10 const,const 2 Using where
16+ CREATE TABLE t2 ( a INT )
17+ SELECT a
18+ FROM t1
19+--- a/mysql-test/r/rowid_order_innodb.result
20++++ b/mysql-test/r/rowid_order_innodb.result
21+@@ -15,7 +15,7 @@
22+ (10, 1, 1);
23+ explain select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
24+ id select_type table type possible_keys key key_len ref rows Extra
25+-1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 4 Using sort_union(key1,key2); Using where
26++1 SIMPLE t1 index_merge key1,key2 key1,key2 5,5 NULL 5 Using sort_union(key1,key2); Using where
27+ select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
28+ pk1 key1 key2
29+ -100 1 1
30+--- a/mysql-test/r/type_bit_innodb.result
31++++ b/mysql-test/r/type_bit_innodb.result
32+@@ -233,7 +233,7 @@
33+ 127 403
34+ explain select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
35+ id select_type table type possible_keys key key_len ref rows Extra
36+-1 SIMPLE t1 range a a 2 NULL 19 Using where; Using index; Using filesort
37++1 SIMPLE t1 range a a 2 NULL 27 Using where; Using index; Using filesort
38+ select a+0, b+0 from t1 where a > 40 and b > 200 order by 1;
39+ a+0 b+0
40+ 44 307
41+--- a/mysql-test/r/endspace.result
42++++ b/mysql-test/r/endspace.result
43+@@ -201,12 +201,12 @@
44+ text1
45+ teststring
46+ teststring
47+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
48++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1, 2;
49+ text1 length(text1)
50+ teststring 11
51+ teststring 10
52+ teststring 11
53+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
54++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1, 2;
55+ text1 length(text1)
56+ teststring 11
57+ teststring 10
58+--- a/mysql-test/t/endspace.test
59++++ b/mysql-test/t/endspace.test
60+@@ -93,8 +93,8 @@
61+ select * from t1 where text1 like 'teststring_%';
62+
63+ # The following gives wrong result in InnoDB
64+-select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%';
65+-select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t';
66++select text1, length(text1) from t1 where text1='teststring' or text1 like 'teststring_%' order by 1, 2;
67++select text1, length(text1) from t1 where text1='teststring' or text1 >= 'teststring\t' order by 1, 2;
68+ select concat('|', text1, '|') from t1 order by text1;
69+ drop table t1;
70+

Subscribers

People subscribed via source and target branches