diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-25 12:19:28 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-25 12:19:28 +0200 |
| commit | 0985653c1f820badb4ab642fe8e9f1287fd20656 (patch) | |
| tree | af2db8bb2a2a932f016529fbf7508121528d132a /sql/item_func.h | |
| parent | 895e3dbbf831cfc6698f1f1f57586224351458b7 (diff) | |
| parent | be5d04e8fced4176ec705b1188a6075e1253d9ca (diff) | |
| download | mariadb-git-0985653c1f820badb4ab642fe8e9f1287fd20656.tar.gz | |
Merge with 4.0
configure.in:
Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_func.h:
Merge
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index b659a6d69d2..31e8afbe5a8 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1123,5 +1123,5 @@ public: enum Item_cast { ITEM_CAST_BINARY, ITEM_CAST_SIGNED_INT, ITEM_CAST_UNSIGNED_INT, - ITEM_CAST_DATE, ITEM_CAST_TIME, ITEM_CAST_DATETIME + ITEM_CAST_DATE, ITEM_CAST_TIME, ITEM_CAST_DATETIME, ITEM_CAST_CHAR }; |