Merge branch '5.5' into 10.0

This commit is contained in:
Sergei Golubchik 2015-12-13 00:10:40 +01:00
commit 1623995158
80 changed files with 1022 additions and 258 deletions

View file

@ -143,5 +143,8 @@ udf_func *find_udf(const char *name, uint len=0,bool mark_used=0);
void free_udf(udf_func *udf);
int mysql_create_function(THD *thd,udf_func *udf);
int mysql_drop_function(THD *thd,const LEX_STRING *name);
#else
static inline void udf_init(void) { }
static inline void udf_free(void) { }
#endif
#endif /* SQL_UDF_INCLUDED */