Commit 9df070ed authored by gluh@mysql.com/eagle.(none)'s avatar gluh@mysql.com/eagle.(none)
Browse files

after merge fix

parent ffeb563d

mysql-test/r/delayed.result

+0 −16
Original line number Diff line number Diff line
@@ -109,20 +109,12 @@ c1 
DROP TABLE t1;

SET             @@auto_increment_offset=

@bug20627_old_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@auto_increment_increment=

@bug20627_old_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET             @@session.auto_increment_offset=

@bug20627_old_session_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@session.auto_increment_increment=

@bug20627_old_session_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET @bug20830_old_auto_increment_offset=

@@auto_increment_offset;

SET @bug20830_old_auto_increment_increment=
@@ -245,20 +237,12 @@ SUM(c1) 
DROP TABLE t1;

SET             @@auto_increment_offset=

@bug20830_old_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@auto_increment_increment=

@bug20830_old_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

SET             @@session.auto_increment_offset=

@bug20830_old_session_auto_increment_offset;

Warnings:

Warning	1292	Truncated incorrect auto-increment-offset value: '0'

SET             @@session.auto_increment_increment=

@bug20830_old_session_auto_increment_increment;

Warnings:

Warning	1292	Truncated incorrect auto-increment-increment value: '0'

CREATE TABLE t1(a BIT);

INSERT DELAYED INTO t1 VALUES(1);

FLUSH TABLE t1;

mysql-test/r/func_misc.result

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ test 
CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (5), (2);

SELECT NAME_CONST(x,2) FROM (SELECT a x FROM t1) t;

ERROR HY000: The 'NAME_CONST' syntax is reserved for purposes internal to the MySQL server

ERROR HY000: Incorrect arguments to NAME_CONST

DROP TABLE t1;

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES (), (), ();

mysql-test/t/func_misc.test

+1 −2
Original line number Diff line number Diff line
@@ -212,12 +212,11 @@ SELECT NAME_CONST('test', 'test'); 
CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (5), (2);



--error ER_RESERVED_SYNTAX

--error ER_WRONG_ARGUMENTS

SELECT NAME_CONST(x,2) FROM (SELECT a x FROM t1) t;



DROP TABLE t1;



--echo End of 5.0 tests



#

# Bug #32559: connection hangs on query with name_const