Commit ad9f8ddc authored by Alexander Barkov's avatar Alexander Barkov

Adjusting test according to the recent change:

Fixing file extension from upper case to lower case.

modified:
  mysql-test/suite/connect/r/ini.result
  mysql-test/suite/connect/t/ini.test
parent 84ab3e89
...@@ -319,8 +319,8 @@ SELECT sec2 AS s, val2 AS v FROM t1; ...@@ -319,8 +319,8 @@ SELECT sec2 AS s, val2 AS v FROM t1;
s v s v
sec1 val11 sec1 val11
sec2 val22 sec2 val22
SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n');; SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n');;
REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n') REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n')
[sec1] [sec1]
val2=val11 val2=val11
[sec2] [sec2]
...@@ -341,8 +341,8 @@ SELECT sec AS s, val AS v FROM t1; ...@@ -341,8 +341,8 @@ SELECT sec AS s, val AS v FROM t1;
s v s v
1sec1 1val1 1sec1 1val1
1sec2 1val2 1sec2 1val2
SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n');; SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n');;
REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n') REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n')
[1sec1] [1sec1]
val=1val1 val=1val1
[1sec2] [1sec2]
...@@ -352,8 +352,8 @@ SELECT sec AS s, val AS v FROM t2; ...@@ -352,8 +352,8 @@ SELECT sec AS s, val AS v FROM t2;
s v s v
2sec1 2val1 2sec1 2val1
2sec2 2val2 2sec2 2val2
SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t2.INI'),'\r\n','\n'),'\n\n','\n');; SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t2.ini'),'\r\n','\n'),'\n\n','\n');;
REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t2.INI'),'\r\n','\n'),'\n\n','\n') REPLACE(REPLACE(LOAD_FILE('DATADIR/test/t2.ini'),'\r\n','\n'),'\n\n','\n')
[2sec1] [2sec1]
val=2val1 val=2val1
[2sec2] [2sec2]
......
...@@ -24,7 +24,7 @@ DROP VIEW v1; ...@@ -24,7 +24,7 @@ DROP VIEW v1;
DROP TABLE t1; DROP TABLE t1;
# Making sure DROP erased the data file # Making sure DROP erased the data file
--error 1 --error 1
--remove_file $MYSQLD_DATADIR/test/t1.INI --remove_file $MYSQLD_DATADIR/test/t1.ini
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
CREATE TABLE t1 (sec CHAR(10) NOT NULL FLAG=1, val CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=INI FILE_NAME='t1.EXT'; CREATE TABLE t1 (sec CHAR(10) NOT NULL FLAG=1, val CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=INI FILE_NAME='t1.EXT';
--connection default --connection default
...@@ -209,9 +209,9 @@ CREATE TABLE t1 (sec2 CHAR(10) NOT NULL FLAG=1, val2 CHAR(10) NOT NULL) ...@@ -209,9 +209,9 @@ CREATE TABLE t1 (sec2 CHAR(10) NOT NULL FLAG=1, val2 CHAR(10) NOT NULL)
ENGINE=CONNECT TABLE_TYPE=INI; ENGINE=CONNECT TABLE_TYPE=INI;
INSERT INTO t1 VALUES ('sec1','val11'),('sec2','val22'); INSERT INTO t1 VALUES ('sec1','val11'),('sec2','val22');
SELECT sec2 AS s, val2 AS v FROM t1; SELECT sec2 AS s, val2 AS v FROM t1;
--chmod 0777 $MYSQLD_DATADIR/test/t1.INI --chmod 0777 $MYSQLD_DATADIR/test/t1.ini
--replace_result $MYSQLD_DATADIR DATADIR --replace_result $MYSQLD_DATADIR DATADIR
--eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n'); --eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n');
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (sec CHAR(10) NOT NULL FLAG=1, val CHAR(10) NOT NULL) CREATE TABLE t1 (sec CHAR(10) NOT NULL FLAG=1, val CHAR(10) NOT NULL)
...@@ -221,11 +221,11 @@ ENGINE=CONNECT TABLE_TYPE=INI; ...@@ -221,11 +221,11 @@ ENGINE=CONNECT TABLE_TYPE=INI;
INSERT INTO t1 VALUES('1sec1','1val1'),('1sec2','1val2'); INSERT INTO t1 VALUES('1sec1','1val1'),('1sec2','1val2');
INSERT INTO t2 VALUES('2sec1','2val1'),('2sec2','2val2'); INSERT INTO t2 VALUES('2sec1','2val1'),('2sec2','2val2');
SELECT sec AS s, val AS v FROM t1; SELECT sec AS s, val AS v FROM t1;
--chmod 0777 $MYSQLD_DATADIR/test/t1.INI --chmod 0777 $MYSQLD_DATADIR/test/t1.ini
--replace_result $MYSQLD_DATADIR DATADIR --replace_result $MYSQLD_DATADIR DATADIR
--eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t1.INI'),'\r\n','\n'),'\n\n','\n'); --eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t1.ini'),'\r\n','\n'),'\n\n','\n');
SELECT sec AS s, val AS v FROM t2; SELECT sec AS s, val AS v FROM t2;
--chmod 0777 $MYSQLD_DATADIR/test/t2.INI --chmod 0777 $MYSQLD_DATADIR/test/t2.ini
--replace_result $MYSQLD_DATADIR DATADIR --replace_result $MYSQLD_DATADIR DATADIR
--eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t2.INI'),'\r\n','\n'),'\n\n','\n'); --eval SELECT REPLACE(REPLACE(LOAD_FILE('$MYSQLD_DATADIR/test/t2.ini'),'\r\n','\n'),'\n\n','\n');
DROP TABLE t1, t2; DROP TABLE t1, t2;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment