bk commit into 4.1 tree (Sinisa:1.1684)

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1684 04/01/22 22:13:24 Sinisa@stripped +4 -0
  Fix for a bug #2422, where CONVERT(expr, cast) was masked by
  CONVERT(expr, expr, expr);

  sql/sql_yacc.yy
    1.292 04/01/22 22:13:19 Sinisa@stripped +2 -10
    Fix for a bug #2422, where CONVERT(expr, cast) was masked by
    CONVERT(expr, expr, expr);

  mysql-test/t/mysqldump.test
    1.11 04/01/22 22:13:19 Sinisa@stripped +6 -6
    fix for my previous result fix of Jani's changes.

  mysql-test/t/cast.test
    1.9 04/01/22 22:13:19 Sinisa@stripped +1 -0
    Fix for a bug #2422, where CONVERT(expr, cast) was masked by
    CONVERT(expr, expr, expr);

  mysql-test/r/cast.result
    1.14 04/01/22 22:13:19 Sinisa@stripped +3 -0
    Fix for a bug #2422, where CONVERT(expr, cast) was masked by
    CONVERT(expr, expr, expr);

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.291/sql/sql_yacc.yy	Tue Jan 20 19:20:08 2004
+++ 1.292/sql/sql_yacc.yy	Thu Jan 22 22:13:19 2004
@@ -664,7 +664,7 @@
 
 %type <ha_rkey_mode> handler_rkey_mode
 
-%type <cast_type> cast_type cast_type_finalize
+%type <cast_type> cast_type
 
 %type <udf_type> udf_func_type
 
@@ -3003,11 +3003,7 @@
 	  $$= $3;
 	};
 
-cast_type_init:
-	{ Lex->charset= NULL; Lex->length= (char*)0; }
-	;
-
-cast_type_finalize:
+cast_type:
 	BINARY			{ $$=ITEM_CAST_BINARY; }
 	| CHAR_SYM opt_len opt_binary	{ $$=ITEM_CAST_CHAR; }
 	| NCHAR_SYM opt_len	{ $$=ITEM_CAST_CHAR; Lex->charset= national_charset_info; }
@@ -3018,10 +3014,6 @@
 	| DATE_SYM		{ $$=ITEM_CAST_DATE; }
 	| TIME_SYM		{ $$=ITEM_CAST_TIME; }
 	| DATETIME		{ $$=ITEM_CAST_DATETIME; }
-	;
-
-cast_type:
-	cast_type_init cast_type_finalize { $$= $2; }
 	;
 
 expr_list:

--- 1.13/mysql-test/r/cast.result	Thu Dec 25 15:42:13 2003
+++ 1.14/mysql-test/r/cast.result	Thu Jan 22 22:13:19 2004
@@ -33,6 +33,9 @@
 select cast("1:2:3" as TIME);
 cast("1:2:3" as TIME)
 01:02:03
+select CONVERT("2004-01-22 21:45:33",DATE);
+CONVERT("2004-01-22 21:45:33",DATE)
[phone]
 set names binary;
 select cast(_latin1'test' as char character set latin2);
 cast(_latin1'test' as char character set latin2)

--- 1.8/mysql-test/t/cast.test	Thu Dec 25 15:42:13 2003
+++ 1.9/mysql-test/t/cast.test	Thu Jan 22 22:13:19 2004
@@ -13,6 +13,7 @@
 select cast("A" as binary) = "a", cast(BINARY "a" as CHAR) = "A";
 select cast("2001-1-1" as DATE), cast("2001-1-1" as DATETIME);
 select cast("1:2:3" as TIME);
+select CONVERT("2004-01-22 21:45:33",DATE);
 
 #
 # Character set convertion

--- 1.10/mysql-test/t/mysqldump.test	Fri Jan 16 20:05:03 2004
+++ 1.11/mysql-test/t/mysqldump.test	Thu Jan 22 22:13:19 2004
@@ -6,7 +6,7 @@
 
 CREATE TABLE t1(a int);
 INSERT INTO t1 VALUES (1), (2);
---exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1
+--exec $MYSQL_DUMP --skip-all --skip-comments -X test t1
 DROP TABLE t1;
 
 #
@@ -16,7 +16,7 @@
 CREATE TABLE t1 (a decimal(240, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
---exec $MYSQL_DUMP --disable-quote --skip-comments test t1
+--exec $MYSQL_DUMP --skip-comments test t1
 DROP TABLE t1;
 
 #
@@ -28,12 +28,12 @@
 # The following replaces is here because some systems replaces the above
 # double with '-inf' and others with MAX_DOUBLE
 --replace_result (-1.79769313486232e+308) (RES) (NULL) (RES)
---exec $MYSQL_DUMP --disable-quote --skip-comments test t1
+--exec $MYSQL_DUMP  --skip-comments test t1
 DROP TABLE t1;
 
 CREATE TABLE t1(a int, b text, c varchar(3));
 INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
---exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1
+--exec $MYSQL_DUMP  --skip-all --skip-comments -X test t1
 DROP TABLE t1;
 
 #
@@ -42,7 +42,7 @@
 
 CREATE TABLE t1 (`a"b"` char(2));
 INSERT INTO t1 VALUES ("1\""), ("\"2");
---exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1
+--exec $MYSQL_DUMP  --skip-all --skip-comments -X test t1
 DROP TABLE t1;
 
 #
@@ -51,5 +51,5 @@
 
 CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
 INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5');
---exec $MYSQL_DUMP --disable-quote --skip-comments test t1
+--exec $MYSQL_DUMP  --skip-comments test t1
 DROP TABLE t1;