mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
unknown 2005-02-18 16:14:28 +04:00
commit c30f658275
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/r/ctype_latin1_de.result
View file

@ -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;

16
mysql-test/t/ctype_latin1_de.test
View file

@ -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;