diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-26 15:05:24 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-26 15:05:24 -0200 |
| commit | 460a90b0bf21aeffe6674921f7c436e3054568be (patch) | |
| tree | 80f1076f83f37362dc2696cf04023c819c6265b6 | |
| parent | d4438c99ff0b2a5e9541b1b259b612fb34c46fe7 (diff) | |
| download | mariadb-git-460a90b0bf21aeffe6674921f7c436e3054568be.tar.gz | |
Post-merge fix: Update warning number due to repositioning in the error list.
mysql-test/r/partition_windows.result:
Update warning number due to new errors appearing earlier
in the list.
mysql-test/r/windows.result:
Update warning number due to new errors appearing earlier
in the list.
| -rw-r--r-- | mysql-test/r/partition_windows.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/windows.result | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/partition_windows.result b/mysql-test/r/partition_windows.result index 87e3a3e970d..756690925f8 100644 --- a/mysql-test/r/partition_windows.result +++ b/mysql-test/r/partition_windows.result @@ -15,16 +15,16 @@ DATA DIRECTORY = 'E:/mysqltest/p2Data' INDEX DIRECTORY = 'F:/mysqltest/p2Index' ); Warnings: -Warning 1616 <DATA DIRECTORY> option ignored -Warning 1616 <INDEX DIRECTORY> option ignored -Warning 1616 <DATA DIRECTORY> option ignored -Warning 1616 <INDEX DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored +Warning 1618 <INDEX DIRECTORY> option ignored +Warning 1618 <DATA DIRECTORY> option ignored +Warning 1618 <INDEX DIRECTORY> option ignored INSERT INTO t1 VALUES (NULL, "first", 1); INSERT INTO t1 VALUES (NULL, "second", 2); INSERT INTO t1 VALUES (NULL, "third", 3); ALTER TABLE t1 ADD PARTITION (PARTITION p3 DATA DIRECTORY = 'G:/mysqltest/p3Data' INDEX DIRECTORY = 'H:/mysqltest/p3Index'); 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 INSERT INTO t1 VALUES (NULL, "last", 4); DROP TABLE t1; diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result index 7ade7b851cc..d056bde4dca 100644 --- a/mysql-test/r/windows.result +++ b/mysql-test/r/windows.result @@ -9,8 +9,8 @@ drop table nu; drop table if exists t1; CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM; 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; CREATE TABLE t1 (a int, b int); INSERT INTO t1 VALUES (1,1); |