diff options
| author | evgen@sunlight.local <> | 2006-07-30 00:33:24 +0400 |
|---|---|---|
| committer | evgen@sunlight.local <> | 2006-07-30 00:33:24 +0400 |
| commit | ef4f14953640962c405e7df7fdb803daaa878128 (patch) | |
| tree | 7459ead6708231c323be75b3f99c455341370348 /mysql-test/r/ps_2myisam.result | |
| parent | 8cd88a91794e37ec05509ef5ea121bcb69eef0c9 (diff) | |
| parent | 3ca575dc896753f9dd52f45eaf983219d5cbd899 (diff) | |
| download | mariadb-git-ef4f14953640962c405e7df7fdb803daaa878128.tar.gz | |
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
Diffstat (limited to 'mysql-test/r/ps_2myisam.result')
| -rw-r--r-- | mysql-test/r/ps_2myisam.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index 5ba601bf305..d42693bdb95 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -1775,7 +1775,7 @@ NULL as const12, @arg12 as param12, show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL DEFAULT '0', + `const01` int(1) NOT NULL DEFAULT '0', `param01` bigint(20) DEFAULT NULL, `const02` decimal(2,1) NOT NULL DEFAULT '0.0', `param02` decimal(65,30) DEFAULT NULL, @@ -1805,7 +1805,7 @@ t5 CREATE TABLE `t5` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 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 const01 const01 3 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 4 3 N 1 1 63 def test t5 t5 param02 param02 246 67 32 Y 0 30 63 |