diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 2ca5b2c7916fe5312617aa992d5292e724af75f0 (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql/item_cmpfunc.h | |
| parent | 7a90f041cc3b6db8600e9469cab6d436653552ec (diff) | |
| parent | 26fc5583196f7b88256cb733be033757a0517266 (diff) | |
| download | mariadb-git-2ca5b2c7916fe5312617aa992d5292e724af75f0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 3462bed94a2..8354f6a5d30 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1725,4 +1725,7 @@ 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 */ |