bk commit into 4.1 tree (bar:1.2497) BUG#18321

[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.2497 06/04/06 10:51:23 bar@stripped +2 -0
  This problem has already been fixed by one of the previous changes.
  Adding test case to cover queries which worked incorrectly earlier:
  Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  mysql-test/t/ctype_latin1.test
    1.8 06/04/06 10:51:17 bar@stripped +14 -0
    Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and
latin1_general_ci

  mysql-test/r/ctype_latin1.result
    1.8 06/04/06 10:51:17 bar@stripped +22 -0
    Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and
latin1_general_ci

# 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

--- 1.7/mysql-test/r/ctype_latin1.result	2005-10-14 13:57:27 +05:00
+++ 1.8/mysql-test/r/ctype_latin1.result	2006-04-06 10:51:17 +05:00
@@ -369,3 +369,25 @@ ERROR 42000: You have an error in your S
 SELECT '„a' as str;
 str
 „a
+set @str= _latin1 'ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc';
+SELECT convert(@str collate latin1_bin using utf8);
+convert(@str collate latin1_bin using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_general_ci using utf8);
+convert(@str collate latin1_general_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_german1_ci using utf8);
+convert(@str collate latin1_german1_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_danish_ci using utf8);
+convert(@str collate latin1_danish_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_spanish_ci using utf8);
+convert(@str collate latin1_spanish_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_german2_ci using utf8);
+convert(@str collate latin1_german2_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc
+SELECT convert(@str collate latin1_swedish_ci using utf8);
+convert(@str collate latin1_swedish_ci using utf8)
+ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc

--- 1.7/mysql-test/t/ctype_latin1.test	2005-10-14 13:57:27 +05:00
+++ 1.8/mysql-test/t/ctype_latin1.test	2006-04-06 10:51:17 +05:00
@@ -95,4 +95,18 @@ SET collation_connection='latin1_bin';
 CREATE TABLE „a (a int);
 SELECT '„a' as str;
 
+
+#
+# Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
+# The problem was in latin1->utf8->latin1 round trip.
+#
+set @str= _latin1 'ABC €°§ß²³µ~ äöüÄÖÜ áéíóú ÀÈÌÒÙ @ abc';
+SELECT convert(@str collate latin1_bin using utf8);
+SELECT convert(@str collate latin1_general_ci using utf8);
+SELECT convert(@str collate latin1_german1_ci using utf8);
+SELECT convert(@str collate latin1_danish_ci using utf8);
+SELECT convert(@str collate latin1_spanish_ci using utf8);
+SELECT convert(@str collate latin1_german2_ci using utf8);
+SELECT convert(@str collate latin1_swedish_ci using utf8);
+
 # End of 4.1 tests