Commit b94e41a1 authored by Davi Arnaut's avatar Davi Arnaut
Browse files

Post-merge fix: Update warning number due to repositioning in the error list.

parent be7629e3

mysql-test/r/partition_windows.result

+6 −6
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/windows.result

+2 −2
Original line number Diff line number Diff line
@@ -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);