Skip to content

M
MariaDB
Commit 126bb345 authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

- Fix MDEV-5497. The city column length was wrong in the create table statements. 

modified:
  storage/connect/mysql-test/connect/r/fix.result
  storage/connect/mysql-test/connect/t/fix.test
parent 43362bc9
Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 136 deletions
storage/connect/mysql-test/connect/r/fix.result
View file @ 126bb345
...@@ -68,64 +68,64 @@ DROP TABLE t1; ...@@ -68,64 +68,64 @@ DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' ENDING=1; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' ENDING=1;
SELECT * FROM t1; SELECT * FROM t1;
name city birth hired name city birth hired
John Boston 2 1986-01-05 2010-06-02 John Boston 1986-01-25 2010-06-02
Henry Boston 0 1987-06-07 2008-04-01 Henry Boston 1987-06-07 2008-04-01
George San Jose 1 1981-08-01 2010-06-02 George San Jose 1981-08-10 2010-06-02
Sam Chicago 2 1979-11-02 2007-10-10 Sam Chicago 1979-11-22 2007-10-10
James Dallas 1 1992-05-03 2009-12-14 James Dallas 1992-05-13 2009-12-14
Bill Boston 1 1986-09-01 2008-02-10 Bill Boston 1986-09-11 2008-02-10
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' LRECL=47 ENDING=1; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' LRECL=47 ENDING=1;
SELECT * FROM t1; SELECT * FROM t1;
name city birth hired name city birth hired
John Boston 2 1986-01-05 2010-06-02 John Boston 1986-01-25 2010-06-02
Henry Boston 0 1987-06-07 2008-04-01 Henry Boston 1987-06-07 2008-04-01
George San Jose 1 1981-08-01 2010-06-02 George San Jose 1981-08-10 2010-06-02
Sam Chicago 2 1979-11-02 2007-10-10 Sam Chicago 1979-11-22 2007-10-10
James Dallas 1 1992-05-03 2009-12-14 James Dallas 1992-05-13 2009-12-14
Bill Boston 1 1986-09-01 2008-02-10 Bill Boston 1986-09-11 2008-02-10
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' ENDING=2; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' ENDING=2;
SELECT * FROM t1; SELECT * FROM t1;
name city birth hired name city birth hired
John Boston 2 1986-01-05 2010-06-02 John Boston 1986-01-25 2010-06-02
Henry Boston 0 1987-06-07 2008-04-01 Henry Boston 1987-06-07 2008-04-01
George San Jose 1 1981-08-01 2010-06-02 George San Jose 1981-08-10 2010-06-02
Sam Chicago 2 1979-11-02 2007-10-10 Sam Chicago 1979-11-22 2007-10-10
James Dallas 1 1992-05-03 2009-12-14 James Dallas 1992-05-13 2009-12-14
Bill Boston 1 1986-09-01 2008-02-10 Bill Boston 1986-09-11 2008-02-10
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' LRECL=47 ENDING=2; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' LRECL=47 ENDING=2;
SELECT * FROM t1; SELECT * FROM t1;
name city birth hired name city birth hired
John Boston 2 1986-01-05 2010-06-02 John Boston 1986-01-25 2010-06-02
Henry Boston 0 1987-06-07 2008-04-01 Henry Boston 1987-06-07 2008-04-01
George San Jose 1 1981-08-01 2010-06-02 George San Jose 1981-08-10 2010-06-02
Sam Chicago 2 1979-11-02 2007-10-10 Sam Chicago 1979-11-22 2007-10-10
James Dallas 1 1992-05-03 2009-12-14 James Dallas 1992-05-13 2009-12-14
Bill Boston 1 1986-09-01 2008-02-10 Bill Boston 1986-09-11 2008-02-10
DROP TABLE t1; DROP TABLE t1;
storage/connect/mysql-test/connect/t/fix.test
View file @ 126bb345
...@@ -61,7 +61,7 @@ DROP TABLE t1; ...@@ -61,7 +61,7 @@ DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' ENDING=1; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' ENDING=1;
...@@ -71,7 +71,7 @@ DROP TABLE t1; ...@@ -71,7 +71,7 @@ DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' LRECL=47 ENDING=1; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boys.txt' LRECL=47 ENDING=1;
...@@ -82,7 +82,7 @@ DROP TABLE t1; ...@@ -82,7 +82,7 @@ DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' ENDING=2; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' ENDING=2;
...@@ -92,7 +92,7 @@ DROP TABLE t1; ...@@ -92,7 +92,7 @@ DROP TABLE t1;
CREATE TABLE t1 CREATE TABLE t1
( (
name char(12) not null, name char(12) not null,
city char(12) not null, city char(11) not null,
birth date not null date_format='DD/MM/YYYY', birth date not null date_format='DD/MM/YYYY',
hired date not null date_format='DD/MM/YYYY' flag=36 hired date not null date_format='DD/MM/YYYY' flag=36
) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' LRECL=47 ENDING=2; ) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='boyswin.txt' LRECL=47 ENDING=2;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7