Commit acb166e3 authored by unknown's avatar unknown
Browse files

Many files: 

  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal


mysql-test/t/ctype_ucs.test:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/t/type_newdecimal.test:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/ctype_ucs.result:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/type_newdecimal.result:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
parent edd28b0c

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -642,3 +642,11 @@ Warnings: 
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;

mysql-test/r/type_newdecimal.result

+0 −8
Original line number Diff line number Diff line
@@ -180,14 +180,6 @@ t1 CREATE TABLE `t1` ( 
  `-(-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

mysql-test/t/ctype_ucs.test

+9 −0
Original line number Diff line number Diff line
@@ -414,3 +414,12 @@ CREATE TABLE t1 (Field1 int(10) unsigned default '0'); 
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;

mysql-test/t/type_newdecimal.test

+0 −9
Original line number Diff line number Diff line
@@ -90,15 +90,6 @@ create table t1 select round(15.4,-1), truncate(-5678.123451,-3), abs(-1.1), -(- 
show create table t1;

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

#