diff options
| author | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
|---|---|---|
| committer | vicentiu <vicentiu@mariadb.org> | 2017-01-06 17:09:59 +0200 |
| commit | e9aed131ead9e102c8948ebadc421960399722d4 (patch) | |
| tree | ae8f4ee4ee7f7e915121ff2c73c88c20781c45ed /sql/sql_udf.cc | |
| parent | e4978d26b79120c58706e57fc66e4de1ec4b230c (diff) | |
| parent | ae1b3d1991b679bb38095711de27934d7683deda (diff) | |
| download | mariadb-git-e9aed131ead9e102c8948ebadc421960399722d4.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 74d2f6bc252..456a6bd4058 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -453,12 +453,8 @@ int mysql_create_function(THD *thd,udf_func *udf) my_message(ER_UDF_NO_PATHS, ER(ER_UDF_NO_PATHS), MYF(0)); DBUG_RETURN(1); } - if (check_string_char_length(&udf->name, "", NAME_CHAR_LEN, - system_charset_info, 1)) - { - my_error(ER_TOO_LONG_IDENT, MYF(0), udf->name.str); + if (check_ident_length(&udf->name)) DBUG_RETURN(1); - } tables.init_one_table(STRING_WITH_LEN("mysql"), STRING_WITH_LEN("func"), "func", TL_WRITE); |