summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_system.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-07 15:47:00 +0200
committermonty@mysql.com <>2004-12-07 15:47:00 +0200
commit563500994a31c2239a7d87ba9c5ea889493e3596 (patch)
treeb1c918186908fb490aa860c35dc9e2154aa633c8 /mysql-test/r/func_system.result
parent77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (diff)
downloadmariadb-git-563500994a31c2239a7d87ba9c5ea889493e3596.tar.gz
Update results for new varchar handling
Fixed compiler warnings String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
Diffstat (limited to 'mysql-test/r/func_system.result')
-rw-r--r--mysql-test/r/func_system.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result
index d3db2cc5151..0f827913780 100644
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/r/func_system.result
@@ -46,8 +46,8 @@ create table t1 (version char(40)) select database(), user(), version() as 'vers
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `database()` char(34) character set utf8 default NULL,
- `user()` char(77) character set utf8 NOT NULL default '',
+ `database()` varchar(34) character set utf8 default NULL,
+ `user()` varchar(77) character set utf8 NOT NULL default '',
`version` char(40) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
@@ -61,8 +61,8 @@ create table t1 select charset(_utf8'a'), collation(_utf8'a');
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `charset(_utf8'a')` char(64) character set utf8 NOT NULL default '',
- `collation(_utf8'a')` char(64) character set utf8 NOT NULL default ''
+ `charset(_utf8'a')` varchar(64) character set utf8 NOT NULL default '',
+ `collation(_utf8'a')` varchar(64) character set utf8 NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
select TRUE,FALSE,NULL;