diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
| commit | 988b25cee10ba94e3137a1d636517577523ce4cb (patch) | |
| tree | 5c1a2630e01dc79cf5496ed561d050026dae416b /sql/item_cmpfunc.h | |
| parent | e22de3a3f28416acf35f55c058c17504d2e6f3ab (diff) | |
| parent | 0eda48463ce9c60408515819f9d954fd48567d4f (diff) | |
| download | mariadb-git-988b25cee10ba94e3137a1d636517577523ce4cb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_yacc.yy
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index c179840746e..488909ae761 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1729,5 +1729,4 @@ 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 */ |