diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
| commit | 2618337eb6dbc8582c04d17f456b590ca8750dd7 (patch) | |
| tree | da19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /mysql-test/r/symlink.result | |
| parent | 1a175aab708fcc4261ffb8983cbe9c7b81e39785 (diff) | |
| parent | ece22ac1b81021b1a1842e5f90cd38d2158dd5f8 (diff) | |
| download | mariadb-git-2618337eb6dbc8582c04d17f456b590ca8750dd7.tar.gz | |
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
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 86985bb6f85..67eed2e41c2 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 0 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 0 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 0 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 0 DATA DIRECTORY option ignored -Warning 0 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 |