bk commit into 5.0 tree (bar:1.1849) BUG#9232

[bar]

Below is the list of changes that have just been committed into a local
5.0 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.1849 05/03/25 17:17:17 bar@stripped +4 -0
  Many files:
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/r/type_newdecimal.result
    1.4 05/03/25 17:16:57 bar@stripped +0 -8
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/r/ctype_ucs.result
    1.32 05/03/25 17:16:47 bar@stripped +8 -0
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/t/type_newdecimal.test
    1.3 05/03/25 17:16:36 bar@stripped +0 -9
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

  mysql-test/t/ctype_ucs.test
    1.27 05/03/25 17:04:19 bar@stripped +9 -0
    Moving UCS2 test into ctype_ucs
    Bug#9232 Test failure: mysql_client_test and type_newdecimal

# 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:	eagle.intranet.mysql.r18.ru
# Root:	/home/bar/mysql-5.0

--- 1.31/mysql-test/r/ctype_ucs.result	Wed Mar 16 05:32:40 2005
+++ 1.32/mysql-test/r/ctype_ucs.result	Fri Mar 25 17:16:47 2005
@@ -642,3 +642,11 @@
 Warning	1264	Out of range value adjusted for column 'Field1' at row 1
 DROP TABLE t1;
 SET NAMES latin1;
+CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
+INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
+update t1 set b=a;
+SELECT * FROM t1;
+a	b
+1.1	1.100
+2.1	2.100
+DROP TABLE t1;

--- 1.26/mysql-test/t/ctype_ucs.test	Wed Mar 16 05:32:41 2005
+++ 1.27/mysql-test/t/ctype_ucs.test	Fri Mar 25 17:04:19 2005
@@ -414,3 +414,12 @@
 INSERT INTO t1 VALUES ('-1');
 DROP TABLE t1;
 SET NAMES latin1;
+
+#
+# Conversion from an UCS2 string to a decimal column
+#
+CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
+INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
+update t1 set b=a;
+SELECT * FROM t1;
+DROP TABLE t1;

--- 1.3/mysql-test/r/type_newdecimal.result	Fri Mar  4 23:05:56 2005
+++ 1.4/mysql-test/r/type_newdecimal.result	Fri Mar 25 17:16:57 2005
@@ -180,14 +180,6 @@
   `-(-1.1)` decimal(7,1) NOT NULL default '0.0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
-CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
-INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
-update t1 set b=a;
-SELECT * FROM t1;
-a	b
-1.1	1.100
-2.1	2.100
-DROP TABLE t1;
 set session sql_mode='traditional';
 select 1e10/0e0;
 1e10/0e0

--- 1.2/mysql-test/t/type_newdecimal.test	Fri Mar  4 23:05:56 2005
+++ 1.3/mysql-test/t/type_newdecimal.test	Fri Mar 25 17:16:36 2005
@@ -91,15 +91,6 @@
 drop table t1;
 
 #
-# conversion from ucs2
-#
-CREATE TABLE t1 (a varchar(64) character set ucs2, b decimal(10,3));
-INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0);
-update t1 set b=a;
-SELECT * FROM t1;
-DROP TABLE t1;
-
-#
 # Trydy's tests
 #
 set session sql_mode='traditional';