diff options
| author | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
| commit | d9d1337e2e1772c8a08051caa71234681d9845b5 (patch) | |
| tree | d4e212a2385d1df6283bfca8b3cace1b20ed1de1 /mysql-test | |
| parent | e77da4fc83cc2cbacad9be4c9efc4704224cf660 (diff) | |
| parent | a171aa693e7f1c28ce67761621d032704fabde70 (diff) | |
| download | mariadb-git-d9d1337e2e1772c8a08051caa71234681d9845b5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/t/union.test:
Resolve conflict
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/union.result | 26 | ||||
| -rw-r--r-- | mysql-test/t/union.test | 18 |
2 files changed, 44 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 042dfb5ad8d..48aac1b3a0a 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1270,3 +1270,29 @@ id 5 99 drop table t1; +create table t1 (f1 decimal(60,25), f2 decimal(60,25)); +insert into t1 values (0.0,0.0); +select f1 from t1 union all select f2 from t1; +f1 +0.0000000000000000000000000 +0.0000000000000000000000000 +select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1 +union all +select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1; +description f1 +XXXXXXXXXXXXXXXXXXXX 0.0000000000000000000000000 +YYYYYYYYYYYYYYYYYYYY 0.0000000000000000000000000 +drop table t1; +create table t1 (f1 decimal(60,24), f2 decimal(60,24)); +insert into t1 values (0.0,0.0); +select f1 from t1 union all select f2 from t1; +f1 +0.000000000000000000000000 +0.000000000000000000000000 +select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1 +union all +select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1; +description f1 +XXXXXXXXXXXXXXXXXXXX 0.000000000000000000000000 +YYYYYYYYYYYYYYYYYYYY 0.000000000000000000000000 +drop table t1; diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index daa83ef0fa4..6de90dd446d 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -753,6 +753,24 @@ create table t2 select a from t1 union select b from t1; show columns from t2; drop table t2, t1; +# +# Bug #14216: UNION + DECIMAL wrong values in result +# +create table t1 (f1 decimal(60,25), f2 decimal(60,25)); +insert into t1 values (0.0,0.0); +select f1 from t1 union all select f2 from t1; +select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1 +union all +select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1; +drop table t1; +create table t1 (f1 decimal(60,24), f2 decimal(60,24)); +insert into t1 values (0.0,0.0); +select f1 from t1 union all select f2 from t1; +select 'XXXXXXXXXXXXXXXXXXXX' as description, f1 from t1 +union all +select 'YYYYYYYYYYYYYYYYYYYY' as description, f2 from t1; +drop table t1; + # # Test that union with VARCHAR produces dynamic row tables # |