Commit 237eda72 authored by Alexander Barkov's avatar Alexander Barkov

Fixing vec.test failure on Windows.

   
- The "spath" column does not get replaces with $MYSQLD_DATADIR,
because it does not include the drive letter part, e.g. C:\.
Removing excluding spath from the "SELECT ... FROM dir1" query

- Warnings return slightly different text on Linux and Windows.
  Linux has extra "/./" part:
    DATADIR/./test/t1vec1

"--replace_result $MYSQLD_DATADIR DATADIR/" does not help.

Using --replace_regex instead.

modified:
  mysql-test/suite/connect/r/vec.result
  mysql-test/suite/connect/t/vec.test
parent 49028611
...@@ -18,8 +18,8 @@ t1 CREATE TABLE `t1` ( ...@@ -18,8 +18,8 @@ t1 CREATE TABLE `t1` (
SELECT * FROM t1; SELECT * FROM t1;
a b a b
Warnings: Warnings:
Warning 1105 Open(rb) error 2 on DATADIR/./test/t1vec1: No such file or directory Warning 1105 Open(rb) error 2 on DATADIR/test/t1vec1: No such file or directory
Warning 1105 Open(rb) error 2 on DATADIR/./test/t1vec2: No such file or directory Warning 1105 Open(rb) error 2 on DATADIR/test/t1vec2: No such file or directory
INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03'); INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03');
SELECT * FROM t1; SELECT * FROM t1;
a b a b
...@@ -39,10 +39,10 @@ test01 ...@@ -39,10 +39,10 @@ test01
test01 test01
test02 test02
test03 test03
SELECT * FROM dir1 ORDER BY fname, ftype; SELECT fname, ftype, size FROM dir1 ORDER BY fname, ftype;
spath fname ftype size fname ftype size
DATADIR/./test/ t1vec1 16 t1vec1 16
DATADIR/./test/ t1vec2 40 t1vec2 40
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
...@@ -58,15 +58,15 @@ t1 CREATE TABLE `t1` ( ...@@ -58,15 +58,15 @@ t1 CREATE TABLE `t1` (
SELECT * FROM t1; SELECT * FROM t1;
a b a b
Warnings: Warnings:
Warning 1105 Open(rb) error 2 on DATADIR/./test/t1vec: No such file or directory Warning 1105 Open(rb) error 2 on DATADIR/test/t1vec: No such file or directory
SELECT a FROM t1; SELECT a FROM t1;
a a
Warnings: Warnings:
Warning 1105 Open(rb) error 2 on DATADIR/./test/t1vec: No such file or directory Warning 1105 Open(rb) error 2 on DATADIR/test/t1vec: No such file or directory
SELECT b FROM t1; SELECT b FROM t1;
b b
Warnings: Warnings:
Warning 1105 Open(rb) error 2 on DATADIR/./test/t1vec: No such file or directory Warning 1105 Open(rb) error 2 on DATADIR/test/t1vec: No such file or directory
INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03'); INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03');
SELECT * FROM t1; SELECT * FROM t1;
a b a b
...@@ -86,10 +86,10 @@ test01 ...@@ -86,10 +86,10 @@ test01
test01 test01
test02 test02
test03 test03
SELECT * FROM dir1 ORDER BY fname, ftype; SELECT fname, ftype, size FROM dir1 ORDER BY fname, ftype;
spath fname ftype size fname ftype size
DATADIR/./test/ t1vec 1400 t1vec 1400
DATADIR/./test/ t1vec .blk 8 t1vec .blk 8
DROP TABLE t1; DROP TABLE t1;
# #
# Clean up # Clean up
......
...@@ -15,14 +15,14 @@ CREATE TABLE t1 ...@@ -15,14 +15,14 @@ CREATE TABLE t1
) ENGINE=CONNECT TABLE_TYPE=VEC FILE_NAME='t1vec'; ) ENGINE=CONNECT TABLE_TYPE=VEC FILE_NAME='t1vec';
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
# Testing SELECT on empty file # Testing SELECT on empty file
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_regex /Open.rb. error 2 on .*\/test\/t1vec/Open(rb) error 2 on DATADIR\/test\/t1vec/
SELECT * FROM t1; SELECT * FROM t1;
INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03'); INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03');
SELECT * FROM t1; SELECT * FROM t1;
SELECT a FROM t1; SELECT a FROM t1;
SELECT b FROM t1; SELECT b FROM t1;
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_result $MYSQLD_DATADIR DATADIR/
SELECT * FROM dir1 ORDER BY fname, ftype; SELECT fname, ftype, size FROM dir1 ORDER BY fname, ftype;
DROP TABLE t1; DROP TABLE t1;
--remove_file $MYSQLD_DATADIR/test/t1vec1 --remove_file $MYSQLD_DATADIR/test/t1vec1
--remove_file $MYSQLD_DATADIR/test/t1vec2 --remove_file $MYSQLD_DATADIR/test/t1vec2
...@@ -35,18 +35,18 @@ CREATE TABLE t1 ...@@ -35,18 +35,18 @@ CREATE TABLE t1
) ENGINE=CONNECT TABLE_TYPE=VEC FILE_NAME='t1vec' MAX_ROWS=10; ) ENGINE=CONNECT TABLE_TYPE=VEC FILE_NAME='t1vec' MAX_ROWS=10;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
# Testing SELECTs on empty file # Testing SELECTs on empty file
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_regex /Open.rb. error 2 on .*\/test\/t1vec/Open(rb) error 2 on DATADIR\/test\/t1vec/
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_regex /Open.rb. error 2 on .*\/test\/t1vec/Open(rb) error 2 on DATADIR\/test\/t1vec/
SELECT a FROM t1; SELECT a FROM t1;
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_regex /Open.rb. error 2 on .*\/test\/t1vec/Open(rb) error 2 on DATADIR\/test\/t1vec/
SELECT b FROM t1; SELECT b FROM t1;
INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03'); INSERT INTO t1 VALUES (0,'test01'), (1,'test01'), (2,'test02'), (3,'test03');
SELECT * FROM t1; SELECT * FROM t1;
SELECT a FROM t1; SELECT a FROM t1;
SELECT b FROM t1; SELECT b FROM t1;
--replace_result $MYSQLD_DATADIR DATADIR/ --replace_result $MYSQLD_DATADIR DATADIR/
SELECT * FROM dir1 ORDER BY fname, ftype; SELECT fname, ftype, size FROM dir1 ORDER BY fname, ftype;
DROP TABLE t1; DROP TABLE t1;
--remove_file $MYSQLD_DATADIR/test/t1vec --remove_file $MYSQLD_DATADIR/test/t1vec
--remove_file $MYSQLD_DATADIR/test/t1vec.blk --remove_file $MYSQLD_DATADIR/test/t1vec.blk
......
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