summaryrefslogtreecommitdiff
path: root/mysql-test/r/symlink.result
diff options
context:
space:
mode:
authoringo@chilla.local <>2006-07-06 13:18:00 +0200
committeringo@chilla.local <>2006-07-06 13:18:00 +0200
commitdb0e7774aac915abcf1b9f30d7711dd66cbfdc4a (patch)
tree3e33e53f128c09130bc36998981ab91bdd917b1c /mysql-test/r/symlink.result
parent3a252caa8660184bee389de16c26fc7a86614aeb (diff)
parentb21acbe089b72b2b1c482352f752c098e8298478 (diff)
downloadmariadb-git-db0e7774aac915abcf1b9f30d7711dd66cbfdc4a.tar.gz
Merge chilla.local:/home/mydev/mysql-5.0-ateam
into chilla.local:/home/mydev/mysql-5.1-ateam
Diffstat (limited to 'mysql-test/r/symlink.result')
-rw-r--r--mysql-test/r/symlink.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result
index 3b24210dd5d..efd6f8710aa 100644
--- a/mysql-test/r/symlink.result
+++ b/mysql-test/r/symlink.result
@@ -74,18 +74,24 @@ t9 CREATE TABLE `t9` (
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'
drop database mysqltest;
create table t1 (a int not null) engine=myisam;
+Warnings:
+Warning 0 DATA DIRECTORY option ignored
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
alter table t1 add b int;
+Warnings:
+Warning 0 DATA DIRECTORY option ignored
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
+Warnings:
+Warning 0 INDEX DIRECTORY option ignored
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (