diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
| commit | a6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3 (patch) | |
| tree | c5510a774ac5e8722c26070e21e3d266d6408381 /sql/item_cmpfunc.h | |
| parent | 71a1b1e755074fa816369a7967ed9bd2758e9f55 (diff) | |
| parent | c5a30828067468d08007bdb36903e411652c8e4b (diff) | |
| download | mariadb-git-a6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3.tar.gz | |
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 3462bed94a2..ec703d0a9f9 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1725,4 +1725,6 @@ inline Item *and_conds(Item *a, Item *b) Item *and_expressions(Item *a, Item *b, Item **org_item); +bool get_mysql_time_from_str(THD *thd, String *str, timestamp_type warn_type, + const char *warn_name, MYSQL_TIME *l_time); #endif /* ITEM_CMPFUNC_INCLUDED */ |