diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-24 10:50:59 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-24 10:50:59 -0200 |
| commit | 463c837c3aaa5c85e8024463bf247a926932de5d (patch) | |
| tree | f22f6d527d9486dd9fee61ed406841efe147658b /mysql-test/r/symlink.result | |
| parent | 03300dc1a44f37e33b4c93c1a82babe90ccf28a8 (diff) | |
| parent | d5202ddd314385374a0afcf61343b7de7f53b192 (diff) | |
| download | mariadb-git-463c837c3aaa5c85e8024463bf247a926932de5d.tar.gz | |
Merge from mysql-5.0-bugteam into mysql-5.1-bugteam
mysql-test/r/partition_not_windows.result:
Update warning number due to new errors appearing earlier
in the list.
mysql-test/r/partition_symlink.result:
Update warning number due to new errors appearing earlier
in the list.
mysql-test/r/symlink.result:
Update warning number due to new errors appearing earlier
in the list.
Diffstat (limited to 'mysql-test/r/symlink.result')
| -rw-r--r-- | mysql-test/r/symlink.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index df4aa343f1f..7711517fe5e 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -79,7 +79,7 @@ drop database mysqltest; create table t1 (a int not null) engine=myisam; alter table t1 data directory="MYSQLTEST_VARDIR/tmp"; Warnings: -Warning 1616 <DATA DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -88,7 +88,7 @@ t1 CREATE TABLE `t1` ( alter table t1 add b int; alter table t1 data directory="MYSQLTEST_VARDIR/log"; Warnings: -Warning 1616 <DATA DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -97,7 +97,7 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t1 index directory="MYSQLTEST_VARDIR/log"; Warnings: -Warning 1616 <INDEX DIRECTORY> option ignored +Warning 1618 <INDEX DIRECTORY> option ignored show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -164,8 +164,8 @@ ERROR HY000: Can't create/write to file 'TEST_DIR/master-data_var/t1.MYI' (Errco SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE='NO_DIR_IN_CREATE'; CREATE TABLE t1(a INT) DATA DIRECTORY='MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY='MYSQLTEST_VARDIR/tmp'; Warnings: -Warning 1616 <DATA DIRECTORY> option ignored -Warning 1616 <INDEX DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored +Warning 1618 <INDEX DIRECTORY> option ignored DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; End of 5.1 tests |