Commit 46283f72 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents 022f2334 9bcd2fb0

mysql-test/r/outfile_loaddata.result

0 → 100644
+85 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1, t2;

#

# Bug#31663 FIELDS TERMINATED BY special character

#

CREATE TABLE t1 (i1 int, i2 int, c1 VARCHAR(256), c2 VARCHAR(256));

INSERT INTO t1 VALUES (101, 202, '-r-', '=raker=');

# FIELDS TERMINATED BY 'raker', warning:

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' FIELDS TERMINATED BY 'raker' FROM t1;

Warnings:

Warning	1475	First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY

SELECT LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt');

LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt')

101raker202raker-r-raker=raker=



CREATE TABLE t2 SELECT * FROM t1;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 FIELDS TERMINATED BY 'raker';

Warnings:

Warning	1262	Row 1 was truncated; it contained more data than there were input columns

SELECT * FROM t2;

i1	i2	c1	c2

101	202	-r-	=raker=

101	202	-r-	=

DROP TABLE t2;

# Only numeric fields, FIELDS TERMINATED BY 'r', no warnings:

SELECT i1, i2 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' FIELDS TERMINATED BY 'r' FROM t1;

SELECT LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt');

LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt')

101r202



CREATE TABLE t2 SELECT i1, i2 FROM t1;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 FIELDS TERMINATED BY 'r';

SELECT i1, i2 FROM t2;

i1	i2

101	202

101	202

DROP TABLE t2;

# FIELDS TERMINATED BY '0', warning:

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' FIELDS TERMINATED BY '0' FROM t1;

Warnings:

Warning	1475	First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY

SELECT LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt');

LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt')

10102020-r-0=raker=



CREATE TABLE t2 SELECT * FROM t1;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 FIELDS TERMINATED BY '0';

Warnings:

Warning	1262	Row 1 was truncated; it contained more data than there were input columns

SELECT * FROM t2;

i1	i2	c1	c2

101	202	-r-	=raker=

1	1	2	2

DROP TABLE t2;

# FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0', warning:

SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0' FROM t1;

Warnings:

Warning	1475	First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY

SELECT LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt');

LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt')

10102020"-r-"0"=raker="



CREATE TABLE t2 SELECT * FROM t1;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0';

Warnings:

Warning	1262	Row 1 was truncated; it contained more data than there were input columns

SELECT * FROM t2;

i1	i2	c1	c2

101	202	-r-	=raker=

1	1	2	2

DROP TABLE t2;

# Only string fields, FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0', no warnings:

SELECT c1, c2 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0' FROM t1;

SELECT LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt');

LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug31663.txt')

"-r-"0"=raker="



CREATE TABLE t2 SELECT c1, c2 FROM t1;

LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0';

SELECT c1, c2 FROM t2;

c1	c2

-r-	=raker=

-r-	=raker=

DROP TABLE t2;

DROP TABLE t1;

# End of 5.0 tests.

mysql-test/r/select.result

+12 −14
Original line number Diff line number Diff line
@@ -4078,22 +4078,20 @@ x 
Warnings:

Warning	1466	Leading spaces are removed from name ' x'

CREATE VIEW v1 AS SELECT 1 AS ``;

Warnings:

Warning	1474	Name ' ' has become ''

SELECT `` FROM v1;



1

CREATE VIEW v2 AS SELECT 1 AS `  `;

Warnings:

Warning	1474	Name '  ' has become ''

SELECT `` FROM v2;



1

CREATE VIEW v3 AS SELECT 1 AS ` x`;

ERROR 42000: Incorrect column name ''

CREATE VIEW v1 AS SELECT 1 AS ` `;

ERROR 42000: Incorrect column name ' '

CREATE VIEW v1 AS SELECT 1 AS `  `;

ERROR 42000: Incorrect column name '  '

CREATE VIEW v1 AS SELECT (SELECT 1 AS `  `);

ERROR 42000: Incorrect column name '  '

CREATE VIEW v1 AS SELECT 1 AS ` x`;

Warnings:

Warning	1466	Leading spaces are removed from name ' x'

SELECT `x` FROM v3;

SELECT `x` FROM v1;

x

1

DROP VIEW v1, v2, v3;

ALTER VIEW v1 AS SELECT 1 AS ` `;

ERROR 42000: Incorrect column name ' '

DROP VIEW v1;

End of 5.0 tests

mysql-test/t/outfile_loaddata.test

0 → 100644
+89 −0
Original line number Diff line number Diff line 
--disable_warnings

DROP TABLE IF EXISTS t1, t2;

--enable_warnings



--echo #

--echo # Bug#31663 FIELDS TERMINATED BY special character

--echo #



CREATE TABLE t1 (i1 int, i2 int, c1 VARCHAR(256), c2 VARCHAR(256));

INSERT INTO t1 VALUES (101, 202, '-r-', '=raker=');



--let $fields=*

--let $clauses=FIELDS TERMINATED BY 'raker'

--echo # $clauses, warning:



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT $fields INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' $clauses FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT LOAD_FILE('$MYSQLTEST_VARDIR/tmp/bug31663.txt')

--eval CREATE TABLE t2 SELECT $fields FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 $clauses

--eval SELECT $fields FROM t2

--remove_file $MYSQLTEST_VARDIR/tmp/bug31663.txt

DROP TABLE t2;



--let $fields=i1, i2

--let $clauses=FIELDS TERMINATED BY 'r'

--echo # Only numeric fields, $clauses, no warnings:



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT $fields INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' $clauses FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT LOAD_FILE('$MYSQLTEST_VARDIR/tmp/bug31663.txt')

--eval CREATE TABLE t2 SELECT $fields FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 $clauses

--eval SELECT $fields FROM t2

--remove_file $MYSQLTEST_VARDIR/tmp/bug31663.txt

DROP TABLE t2;



--let $fields=*

--let $clauses=FIELDS TERMINATED BY '0'

--echo # $clauses, warning:



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT $fields INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' $clauses FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT LOAD_FILE('$MYSQLTEST_VARDIR/tmp/bug31663.txt')

--eval CREATE TABLE t2 SELECT $fields FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 $clauses

--eval SELECT $fields FROM t2

--remove_file $MYSQLTEST_VARDIR/tmp/bug31663.txt

DROP TABLE t2;



--let $fields=*

--let $clauses=FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0'

--echo # $clauses, warning:



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT $fields INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' $clauses FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT LOAD_FILE('$MYSQLTEST_VARDIR/tmp/bug31663.txt')

--eval CREATE TABLE t2 SELECT $fields FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 $clauses

--eval SELECT $fields FROM t2

--remove_file $MYSQLTEST_VARDIR/tmp/bug31663.txt

DROP TABLE t2;



--let $fields=c1, c2

--let $clauses=FIELDS OPTIONALLY ENCLOSED BY '"' TERMINATED BY '0'

--echo # Only string fields, $clauses, no warnings:



--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT $fields INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' $clauses FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval SELECT LOAD_FILE('$MYSQLTEST_VARDIR/tmp/bug31663.txt')

--eval CREATE TABLE t2 SELECT $fields FROM t1

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/bug31663.txt' INTO TABLE t2 $clauses

--eval SELECT $fields FROM t2

--remove_file $MYSQLTEST_VARDIR/tmp/bug31663.txt

DROP TABLE t2;



DROP TABLE t1;



--echo # End of 5.0 tests.

mysql-test/t/select.test

+15 −8
Original line number Diff line number Diff line
@@ -3466,22 +3466,29 @@ DROP TABLE t1; 
#



--disable_ps_protocol



SELECT 1 AS ` `;

SELECT 1 AS `  `;

SELECT 1 AS ` x`;

--enable_ps_protocol



--error 1166

CREATE VIEW v1 AS SELECT 1 AS ``;

SELECT `` FROM v1;



CREATE VIEW v2 AS SELECT 1 AS `  `;

SELECT `` FROM v2;

--error 1166

CREATE VIEW v1 AS SELECT 1 AS ` `;



CREATE VIEW v3 AS SELECT 1 AS ` x`;

SELECT `x` FROM v3;

--error 1166

CREATE VIEW v1 AS SELECT 1 AS `  `;



DROP VIEW v1, v2, v3;

--error 1166

CREATE VIEW v1 AS SELECT (SELECT 1 AS `  `);



--enable_ps_protocol

CREATE VIEW v1 AS SELECT 1 AS ` x`;

SELECT `x` FROM v1;



--error 1166

ALTER VIEW v1 AS SELECT 1 AS ` `;



DROP VIEW v1;



--echo End of 5.0 tests

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5639,3 +5639,5 @@ ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT 
	eng "Too high level of nesting for select"

ER_NAME_BECOMES_EMPTY

        eng "Name '%-.64s' has become ''"

ER_AMBIGUOUS_FIELD_TERM

	eng "First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY"