summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-10-07 21:41:05 +0300
committerunknown <monty@narttu.mysql.fi>2003-10-07 21:41:05 +0300
commit19e954d2f8ae119cbaf60c2ff74cdff7a35b051a (patch)
treef400f59153626ec43b76882b95edaef678477dd5 /mysql-test
parentc7fd510a4191eb85890dddc235852f3b8a98362d (diff)
parentcd6dc42fdf525fdcde2b054fdf5a39ab01e1e16b (diff)
downloadmariadb-git-19e954d2f8ae119cbaf60c2ff74cdff7a35b051a.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/create.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index e6192eb6ccb..7b784e3c3ee 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -78,7 +78,7 @@ Field Type Null Key Default Extra
x varchar(50) YES NULL
describe t2;
Field Type Null Key Default Extra
-x char(50) YES NULL
+x varchar(50) YES NULL
drop table t2;
create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f;
describe t2;