Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint

into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732

2 files changed, 21 insertions, 1 deletions

diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index b436519d967..f25d94f8066 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -649,3 +649,13 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))
 pk1	pk2	pk3	pk4	filler
 2621	2635	1000015	0	filler
 drop table t1, t2;
+create table t1(a char(2), key(a(1)));
+insert into t1 values ('x'), ('xx');
+explain select a from t1 where a > 'x';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	a	a	2	NULL	2	Using where
+select a from t1 where a > 'x';
+a
+xx
+drop table t1;
+End of 4.1 tests
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 9280911df2c..245178d7d4a 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -510,4 +510,14 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))
 ) AND (pk3 >=1000000);
 drop table t1, t2;
 
-# End of 4.1 tests
+#
+# Bug #20732: Partial index and long sjis search with '>' fails sometimes
+#
+
+create table t1(a char(2), key(a(1)));
+insert into t1 values ('x'), ('xx');
+explain select a from t1 where a > 'x';
+select a from t1 where a > 'x';
+drop table t1;
+
+--echo End of 4.1 tests