bk commit into 4.1 tree (bar:1.2461)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2461 05/10/25 12:10:49 bar@stripped +3 -0
  latin5.xml:
    Bugs#13421: problem with sorting turkish
    Changes order of the letters:
    - A WITH CIRCUMFLEX
    - I WITH CIRCUMFLEX
    - U WITH CURCUMFLEX
    to be equal their non-accented
    counterparts, according to
    Turkish dictionary order.
  ctype_latin5.test, ctype_latin5.result:
    new file

  sql/share/charsets/latin5.xml
    1.6 05/10/25 12:08:47 bar@stripped +4 -4
    Bugs#13421: problem with sorting turkish
    Changes order of the letters:
    - A WITH CIRCUMFLEX
    - I WITH CIRCUMFLEX
    - U WITH CURCUMFLEX
    to be equal their non-accented
    counterparts, according to
    Turkish dictionary order.

  mysql-test/t/ctype_latin5.test
    1.1 05/10/25 12:08:33 bar@stripped +37 -0

  mysql-test/r/ctype_latin5.result
    1.1 05/10/25 12:08:33 bar@stripped +49 -0

  mysql-test/t/ctype_latin5.test
    1.0 05/10/25 12:08:33 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b13421/mysql-test/t/ctype_latin5.test

  mysql-test/r/ctype_latin5.result
    1.0 05/10/25 12:08:33 bar@stripped +0 -0
    BitKeeper file /usr/home/bar/mysql-4.1.b13421/mysql-test/r/ctype_latin5.result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b13421

--- 1.5/sql/share/charsets/latin5.xml	2004-09-11 00:53:01 +05:00
+++ 1.6/sql/share/charsets/latin5.xml	2005-10-25 12:08:47 +05:00
@@ -130,10 +130,10 @@
  9C 9D 9E 9F A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB
  AC AD AE AF B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB
  BC BD BE BF C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB
- CC CD CE CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 D9 DA
- 49 DB DC DD DE DF 53 E0 E1 E2 E3 E4 5B 4C 58 E5
- CC CD CE CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 D9 DA
- 49 DB DC DD DE DF 53 FA E1 E2 E3 E4 5B 4B 58 FF
+ CC CD 41 CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 4C DA
+ 49 DB DC DD DE DF 53 E0 E1 E2 E3 5A 5B 4C 58 E5
+ CC CD 41 CF D0 D1 D2 44 D3 D4 D5 D6 D7 D8 4C DA
+ 49 DB DC DD DE DF 53 FA E1 E2 E3 5A 5B 4B 58 FF
 </map>
 </collation>
 
--- New file ---
+++ mysql-test/r/ctype_latin5.result	05/10/25 12:08:33
drop table if exists t1;
create table t1 (word varchar(40), key(word(40)))
character set latin5 collate latin5_turkish_ci;
INSERT INTO t1 (word) VALUES ('A');
INSERT INTO t1 (word) VALUES ('a');
INSERT INTO t1 (word) VALUES ('â');
INSERT INTO t1 (word) VALUES ('Â');
INSERT INTO t1 (word) VALUES ('B');
INSERT INTO t1 (word) VALUES ('b');
INSERT INTO t1 (word) VALUES ('H');
INSERT INTO t1 (word) VALUES ('h');
INSERT INTO t1 (word) VALUES ('I');
INSERT INTO t1 (word) VALUES ('i');
INSERT INTO t1 (word) VALUES ('Î');
INSERT INTO t1 (word) VALUES ('î');
INSERT INTO t1 (word) VALUES ('J');
INSERT INTO t1 (word) VALUES ('j');
INSERT INTO t1 (word) VALUES ('U');
INSERT INTO t1 (word) VALUES ('u');
INSERT INTO t1 (word) VALUES ('Û');
INSERT INTO t1 (word) VALUES ('û');
INSERT INTO t1 (word) VALUES ('Ü');
INSERT INTO t1 (word) VALUES ('ü');
INSERT INTO t1 (word) VALUES ('v');
INSERT INTO t1 (word) VALUES ('V');
SELECT word FROM t1 ORDER BY word, BINARY word;
word
A
a
Â
â
B
b
H
h
I
i
Î
î
J
j
U
u
Û
û
Ü
ü
V
v

--- New file ---
+++ mysql-test/t/ctype_latin5.test	05/10/25 12:08:33
#
# Tests with the latin5 character set
#
--disable_warnings
drop table if exists t1;
--enable_warnings

#
# Bug#13421 problem with sorting turkish
#

create table t1 (word varchar(40), key(word(40)))
character set latin5 collate latin5_turkish_ci;
INSERT INTO t1 (word) VALUES ('A');
INSERT INTO t1 (word) VALUES ('a');
INSERT INTO t1 (word) VALUES ('â');
INSERT INTO t1 (word) VALUES ('Â');
INSERT INTO t1 (word) VALUES ('B');
INSERT INTO t1 (word) VALUES ('b');
INSERT INTO t1 (word) VALUES ('H');
INSERT INTO t1 (word) VALUES ('h');
INSERT INTO t1 (word) VALUES ('I');
INSERT INTO t1 (word) VALUES ('i');
INSERT INTO t1 (word) VALUES ('Î');
INSERT INTO t1 (word) VALUES ('î');
INSERT INTO t1 (word) VALUES ('J');
INSERT INTO t1 (word) VALUES ('j');
INSERT INTO t1 (word) VALUES ('U');
INSERT INTO t1 (word) VALUES ('u');
INSERT INTO t1 (word) VALUES ('Û');
INSERT INTO t1 (word) VALUES ('û');
INSERT INTO t1 (word) VALUES ('Ü');
INSERT INTO t1 (word) VALUES ('ü');
INSERT INTO t1 (word) VALUES ('v');
INSERT INTO t1 (word) VALUES ('V');
SELECT word FROM t1 ORDER BY word, BINARY word;
# End of 4.1 tests