after merge fix

mysql-test/r/select.result

@@ -2454,7 +2454,7 @@ select all distinct * from t1;
 ERROR HY000: Incorrect usage of ALL and DISTINCT
 select distinct all * from t1;
 ERROR HY000: Incorrect usage of ALL and DISTINCT
-DROP TABLE t1;
+drop table t1;
 CREATE TABLE t1 (
 kunde_intern_id int(10) unsigned NOT NULL default '0',
 kunde_id int(10) unsigned NOT NULL default '0',

sql/sql_udf.cc

@@ -195,7 +195,7 @@ void udf_init()
     */
     if (strchr(dl_name, '/') ||
         IF_WIN(strchr(dl_name, '\\'),0) ||
-        strlen(name) > NAME_LEN)
+        strlen(name.str) > NAME_LEN)
     {
       sql_print_error("Invalid row in mysql.func table for function '%.64s'",
                       name.str);