Merge mysql.com:/home/mydev/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-bug4788

1 files changed, 26 insertions, 0 deletions

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5d3f32cdd55..b2a97ce3e48 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -452,3 +452,29 @@ set global log_warnings = @tstlw;
 show global variables like 'log_warnings';
 Variable_name	Value
 log_warnings	1
+create table t1 (
+c1 tinyint,
+c2 smallint,
+c3 mediumint,
+c4 int,
+c5 bigint);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` tinyint(4) default NULL,
+  `c2` smallint(6) default NULL,
+  `c3` mediumint(9) default NULL,
+  `c4` int(11) default NULL,
+  `c5` bigint(20) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
+set @arg00= 8, @arg01= 8.8, @arg02= 'a string';
+create table t1 as select @arg00 as c1, @arg01 as c2, @arg02 as c3;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` bigint(20) default NULL,
+  `c2` double default NULL,
+  `c3` longtext
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;