bk commit into 5.0 tree (gluh:1.2581)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-13 15:47:23+04:00, gluh@stripped +3 -0
  after merge fix

  mysql-test/r/delayed.result@stripped, 2007-12-13 15:47:21+04:00, gluh@stripped +0 -16
    after merge fix

  mysql-test/r/func_misc.result@stripped, 2007-12-13 15:47:21+04:00, gluh@stripped +1 -1
    after merge fix

  mysql-test/t/func_misc.test@stripped, 2007-12-13 15:47:21+04:00, gluh@stripped +1 -2
    after merge fix

diff -Nrup a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result
--- a/mysql-test/r/delayed.result	2007-12-13 14:49:11 +04:00
+++ b/mysql-test/r/delayed.result	2007-12-13 15:47:21 +04:00
@@ -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;
diff -Nrup a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
--- a/mysql-test/r/func_misc.result	2007-12-13 14:52:47 +04:00
+++ b/mysql-test/r/func_misc.result	2007-12-13 15:47:21 +04:00
@@ -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 (), (), ();
diff -Nrup a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
--- a/mysql-test/t/func_misc.test	2007-12-13 14:52:47 +04:00
+++ b/mysql-test/t/func_misc.test	2007-12-13 15:47:21 +04:00
@@ -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