Commit 1699947e authored by Olivier Bertrand's avatar Olivier Bertrand

- Make alter.test to work on both Windows and Linux

modified:
  storage/connect/mysql-test/connect/r/alter.result
  storage/connect/mysql-test/connect/t/alter.test
parent ad9d7e85
...@@ -193,7 +193,7 @@ DROP TABLE t1, t2; ...@@ -193,7 +193,7 @@ DROP TABLE t1, t2;
# #
# Testing ALTER on outward tables # Testing ALTER on outward tables
# #
CREATE TABLE t1 (c INT NOT NULL, d CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=fix FILE_NAME='tf1.txt'; CREATE TABLE t1 (c INT NOT NULL, d CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=fix FILE_NAME='tf1.txt' ENDING=1;
INSERT INTO t1 VALUES (1,'One'), (2,'Two'), (3,'Three'); INSERT INTO t1 VALUES (1,'One'), (2,'Two'), (3,'Three');
SELECT * FROM t1; SELECT * FROM t1;
c d c d
...@@ -238,9 +238,9 @@ Table Create Table ...@@ -238,9 +238,9 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`c` char(5) NOT NULL, `c` char(5) NOT NULL,
`d` char(10) NOT NULL `d` char(10) NOT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1
SELECT * FROM t1; SELECT * FROM t1;
ERROR HY000: Got error 174 'File tf1.txt is not fixed length, len=69 lrecl=17' from CONNECT ERROR HY000: Got error 174 'File tf1.txt is not fixed length, len=66 lrecl=16' from CONNECT
ALTER TABLE t1 MODIFY COLUMN c INT NOT NULL; ALTER TABLE t1 MODIFY COLUMN c INT NOT NULL;
Warnings: Warnings:
Warning 1105 This is an outward table, table data were not modified. Warning 1105 This is an outward table, table data were not modified.
...@@ -260,7 +260,7 @@ Table Create Table ...@@ -260,7 +260,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`d` char(10) NOT NULL, `d` char(10) NOT NULL,
`c` int(11) NOT NULL `c` int(11) NOT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1
# Wrong result # Wrong result
SELECT * FROM t1; SELECT * FROM t1;
d c d c
...@@ -279,7 +279,7 @@ Table Create Table ...@@ -279,7 +279,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`d` char(10) NOT NULL `FLAG`=11, `d` char(10) NOT NULL `FLAG`=11,
`c` int(11) NOT NULL `FLAG`=0 `c` int(11) NOT NULL `FLAG`=0
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1
SELECT * FROM t1; SELECT * FROM t1;
d c d c
One 1 One 1
...@@ -295,7 +295,7 @@ Table Create Table ...@@ -295,7 +295,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`d` char(10) NOT NULL `FLAG`=11, `d` char(10) NOT NULL `FLAG`=11,
`c` int(11) NOT NULL `FLAG`=0 `c` int(11) NOT NULL `FLAG`=0
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1
SELECT * from t1; SELECT * from t1;
d c d c
One 1 One 1
...@@ -322,7 +322,7 @@ Table Create Table ...@@ -322,7 +322,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`d` char(10) NOT NULL `FLAG`=11, `d` char(10) NOT NULL `FLAG`=11,
`c` int(11) NOT NULL `FLAG`=0 `c` int(11) NOT NULL `FLAG`=0
) ENGINE=CONNECT DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' ) ENGINE=CONNECT DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `TABLE_TYPE`=fix `FILE_NAME`='tf1.txt' `ENDING`=1
SELECT * from t1; SELECT * from t1;
d c d c
One 1 One 1
......
...@@ -80,7 +80,7 @@ DROP TABLE t1, t2; ...@@ -80,7 +80,7 @@ DROP TABLE t1, t2;
--echo # --echo #
--echo # Testing ALTER on outward tables --echo # Testing ALTER on outward tables
--echo # --echo #
CREATE TABLE t1 (c INT NOT NULL, d CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=fix FILE_NAME='tf1.txt'; CREATE TABLE t1 (c INT NOT NULL, d CHAR(10) NOT NULL) ENGINE=CONNECT TABLE_TYPE=fix FILE_NAME='tf1.txt' ENDING=1;
INSERT INTO t1 VALUES (1,'One'), (2,'Two'), (3,'Three'); INSERT INTO t1 VALUES (1,'One'), (2,'Two'), (3,'Three');
SELECT * FROM t1; SELECT * FROM t1;
CREATE TABLE t2 (line VARCHAR(100) NOT NULL) ENGINE=CONNECT FILE_NAME='tf1.txt'; CREATE TABLE t2 (line VARCHAR(100) NOT NULL) ENGINE=CONNECT FILE_NAME='tf1.txt';
......
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