diff options
| author | unknown <svoj@may.pils.ru> | 2006-09-18 20:35:33 +0500 |
|---|---|---|
| committer | unknown <svoj@may.pils.ru> | 2006-09-18 20:35:33 +0500 |
| commit | 186573b3d6301532b5d5fa9b470335e19f49769c (patch) | |
| tree | 7c83600d388cf62761cc929de9a29d2eeb6d8ec2 /mysql-test/r/myisam.result | |
| parent | ab7d1d70a4db399ed69b73c523b14483fa786bdf (diff) | |
| parent | 96dbaffda6c606e1769b7feeedf91d9839e820b8 (diff) | |
| download | mariadb-git-186573b3d6301532b5d5fa9b470335e19f49769c.tar.gz | |
Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
Diffstat (limited to 'mysql-test/r/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index ec0a6a7a5af..05f72b22ed1 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -801,12 +801,12 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/' show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/' create table t1 (a int) engine=myisam select 42 a; select * from t1; a |