diff options
author | unknown <serg@serg.mylan> | 2003-10-07 20:41:07 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2003-10-07 20:41:07 +0200 |
commit | 08bb033b537247521314211457fff76a5cfdd5e2 (patch) | |
tree | 861115d5e43f6893d483a985197f5bad6305957c /mysql-test/r/create.result | |
parent | 93e1bbf671d775095fc0d7600bd817e85131a5f2 (diff) | |
parent | 654d266c8bca6ef770e4a592b32696e920ce0e98 (diff) | |
download | mariadb-git-08bb033b537247521314211457fff76a5cfdd5e2.tar.gz |
merged
mysql-test/r/create.result:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r-- | mysql-test/r/create.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 51952009f08..3ebe6df21b9 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; |