Merge gluh@gw:/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged

1 files changed, 14 insertions, 2 deletions

diff --git a/sql/lex.h b/sql/lex.h
index bb6e7a81ab4..a148baad07f 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -116,6 +116,7 @@ static SYMBOL symbols[] = {
   { "DATETIME",		SYM(DATETIME),0,0},
   { "DAY",		SYM(DAY_SYM),0,0},
   { "DAY_HOUR",		SYM(DAY_HOUR_SYM),0,0},
+  { "DAY_MICROSECOND",	SYM(DAY_MICROSECOND_SYM),0,0},
   { "DAY_MINUTE",	SYM(DAY_MINUTE_SYM),0,0},
   { "DAY_SECOND",	SYM(DAY_SECOND_SYM),0,0},
   { "DEC",		SYM(DECIMAL_SYM),0,0},
@@ -186,6 +187,7 @@ static SYMBOL symbols[] = {
   { "HELP",		SYM(HELP_SYM),0,0},
   { "HIGH_PRIORITY",	SYM(HIGH_PRIORITY),0,0},
   { "HOUR",		SYM(HOUR_SYM),0,0},
+  { "HOUR_MICROSECOND",	SYM(HOUR_MICROSECOND_SYM),0,0},
   { "HOUR_MINUTE",	SYM(HOUR_MINUTE_SYM),0,0},
   { "HOUR_SECOND",	SYM(HOUR_SECOND_SYM),0,0},
   { "HOSTS",		SYM(HOSTS_SYM),0,0},
@@ -259,9 +261,11 @@ static SYMBOL symbols[] = {
   { "MERGE",		SYM(MERGE_SYM),0,0},
   { "MEDIUM",		SYM(MEDIUM_SYM),0,0},
   { "MEMORY",		SYM(MEMORY_SYM),0,0},
+  { "MICROSECOND",	SYM(MICROSECOND_SYM),0,0},
   { "MIDDLEINT",	SYM(MEDIUMINT),0,0},	/* For powerbuilder */
   { "MIN_ROWS",		SYM(MIN_ROWS),0,0},
   { "MINUTE",		SYM(MINUTE_SYM),0,0},
+  { "MINUTE_MICROSECOND", SYM(MINUTE_MICROSECOND_SYM),0,0},
   { "MINUTE_SECOND",	SYM(MINUTE_SECOND_SYM),0,0},
   { "MOD",		SYM(MOD_SYM),0,0},
   { "MODE",		SYM(MODE_SYM),0,0},
@@ -337,6 +341,7 @@ static SYMBOL symbols[] = {
   { "ROWS",		SYM(ROWS_SYM),0,0},
   { "RTREE",		SYM(RTREE_SYM),0,0},
   { "SECOND",		SYM(SECOND_SYM),0,0},
+  { "SECOND_MICROSECOND", SYM(SECOND_MICROSECOND_SYM),0,0},
   { "SEPARATOR",	SYM(SEPARATOR_SYM),0,0},
   { "SELECT",		SYM(SELECT_SYM),0,0},
   { "SERIAL",		SYM(SERIAL_SYM),0,0},
@@ -427,7 +432,8 @@ static SYMBOL symbols[] = {
 static SYMBOL sql_functions[] = {
   { "ABS",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_abs)},
   { "ACOS",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_acos)},
-  { "ADDDATE",		SYM(DATE_ADD_INTERVAL),0,0},
+  { "ADDDATE",		SYM(ADDDATE_SYM),0,0},
+  { "ADDTIME",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_addtime)},
   { "AES_ENCRYPT",      SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_aes_encrypt)},
   { "AES_DECRYPT",      SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_aes_decrypt)},
   { "AREA",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_area)},
@@ -470,6 +476,7 @@ static SYMBOL sql_functions[] = {
   { "CURDATE",		SYM(CURDATE),0,0},
   { "CURTIME",		SYM(CURTIME),0,0},
   { "DATE_ADD",		SYM(DATE_ADD_INTERVAL),0,0},
+  { "DATEDIFF",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_datediff)},
   { "DATE_FORMAT",	SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_date_format)},
   { "DATE_SUB",		SYM(DATE_SUB_INTERVAL),0,0},
   { "DAYNAME",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_dayname)},
@@ -545,6 +552,8 @@ static SYMBOL sql_functions[] = {
   { "LPAD",		SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_lpad)},
   { "LTRIM",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ltrim)},
   { "MAKE_SET",		SYM(MAKE_SET_SYM),0,0},
+  { "MAKEDATE",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_makedate)},
+  { "MAKETIME",		SYM(FUNC_ARG3),0,CREATE_FUNC(create_func_maketime)},
   { "MASTER_POS_WAIT",	SYM(MASTER_POS_WAIT),0,0},
   { "MAX",		SYM(MAX_SYM),0,0},
   { "MBRCONTAINS",	SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_contains)},
@@ -605,7 +614,7 @@ static SYMBOL sql_functions[] = {
   { "RTRIM",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_rtrim)},
   { "SEC_TO_TIME",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sec_to_time)},
   { "SESSION_USER",	SYM(USER),0,0},
-  { "SUBDATE",		SYM(DATE_SUB_INTERVAL),0,0},
+  { "SUBDATE",		SYM(SUBDATE_SYM),0,0},
   { "SIGN",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sign)},
   { "SIN",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sin)},
   { "SHA",              SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_sha)},
@@ -620,12 +629,14 @@ static SYMBOL sql_functions[] = {
   { "STRCMP",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_strcmp)},
   { "SUBSTRING",	SYM(SUBSTRING),0,0},
   { "SUBSTRING_INDEX",	SYM(SUBSTRING_INDEX),0,0},
+  { "SUBTIME",          SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_subtime)},
   { "SUM",		SYM(SUM_SYM),0,0},
   { "SYSDATE",		SYM(NOW_SYM),0,0},
   { "SYSTEM_USER",	SYM(USER),0,0},
   { "TAN",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_tan)},
   { "TIME_FORMAT",	SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_time_format)},
   { "TIME_TO_SEC",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_time_to_sec)},
+  { "TIMEDIFF",         SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_timediff)},
   { "TO_DAYS",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_to_days)},
   { "TOUCHES",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_touches)},
   { "TRIM",		SYM(TRIM),0,0},
@@ -639,6 +650,7 @@ static SYMBOL sql_functions[] = {
   { "VERSION",		SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_version)},
   { "WEEK",		SYM(WEEK_SYM),0,0},
   { "WEEKDAY",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekday)},
+  { "WEEKOFYEAR",	SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_weekofyear)},
   { "WITHIN",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_within)},
   { "X",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_x)},
   { "Y",		SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_y)},