Merge mysql.com:/usr/home/bar/mysql-4.1

into mysql.com:/usr/home/bar/mysql-5.0.fresh


include/my_base.h:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged

mysql-test/r/ctype_latin1_de.result

@@ -326,3 +326,15 @@ latin1_german2_ci	6109
 latin1_german2_ci	61
 latin1_german2_ci	6120
 drop table t1;
+SET NAMES latin1;
+CREATE TABLE t1 (
+col1 varchar(255) NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 collate latin1_german2_ci;
+INSERT INTO t1 VALUES (''),('ss'),('ss');
+ALTER TABLE t1 ADD KEY ifword(col1);
+SELECT * FROM t1 WHERE col1='' ORDER BY col1, BINARY col1;
+col1
+ss
+ss
+
+DROP TABLE t1;

mysql-test/t/ctype_latin1_de.test

@@ -116,3 +116,19 @@ SELECT FIELD('ue',s1), FIELD('
 DROP TABLE t1;
 
 -- source include/ctype_filesort.inc
+
+#
+# Bug#7878 with utf8_general_ci, equals (=) has problem with
+# accent insensitivity.
+# Although originally this problem was found with UTF8 character set,
+# '=' behaved wrong for latin1_german2_ci as well.
+# Let's check it does not work incorrect anymore.
+# 
+SET NAMES latin1;
+CREATE TABLE t1 (
+  col1 varchar(255) NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 collate latin1_german2_ci;
+INSERT INTO t1 VALUES (''),('ss'),('ss');
+ALTER TABLE t1 ADD KEY ifword(col1);
+SELECT * FROM t1 WHERE col1='' ORDER BY col1, BINARY col1;
+DROP TABLE t1;