diff options
| author | unknown <kent@mysql.com> | 2006-05-17 23:35:08 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-05-17 23:35:08 +0200 |
| commit | e78b4cca2570ae8116bd5cdba5742d7e32d44350 (patch) | |
| tree | b445582aaece08ed7bc0175eeb09cd1ebdd6db1c /mysql-test/r/ps_6bdb.result | |
| parent | 8df5fdb9334ff4c908471d5a6bd76dee57e3e9db (diff) | |
| parent | fe3ac3007a3766be7e826724b6bc3cf59b9930d0 (diff) | |
| download | mariadb-git-e78b4cca2570ae8116bd5cdba5742d7e32d44350.tar.gz | |
Merge mysql.com:/data0/mysqldev/my/tmp_merge
into mysql.com:/tmp/mysql-5.1-new
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_6bdb.result')
| -rw-r--r-- | mysql-test/r/ps_6bdb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index ea1212addf5..44b4ebf33d4 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.result @@ -1760,7 +1760,7 @@ Table Create Table t5 CREATE TABLE `t5` ( `const01` bigint(1) NOT NULL DEFAULT '0', `param01` bigint(20) DEFAULT NULL, - `const02` decimal(2,1) unsigned NOT NULL DEFAULT '0.0', + `const02` decimal(2,1) NOT NULL DEFAULT '0.0', `param02` decimal(65,30) DEFAULT NULL, `const03` double NOT NULL DEFAULT '0', `param03` double DEFAULT NULL, @@ -1790,7 +1790,7 @@ select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr def test t5 t5 const01 const01 8 1 1 N 32769 0 63 def test t5 t5 param01 param01 8 20 1 Y 32768 0 63 -def test t5 t5 const02 const02 246 3 3 N 33 1 63 +def test t5 t5 const02 const02 246 4 3 N 1 1 63 def test t5 t5 param02 param02 246 67 32 Y 0 30 63 def test t5 t5 const03 const03 5 17 1 N 32769 31 63 def test t5 t5 param03 param03 5 23 1 Y 32768 31 63 |