Commit 03e26e50 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mdk10.(none):/home/reggie/bk/mysql-5.0


sql/spatial.cc:
  Auto merged
parents b07d4dfc c321b2ba

sql/sql_udf.cc

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ int mysql_create_function(THD *thd,udf_func *udf) 
    This is done to ensure that only approved dll from the system

    directories are used (to make this even remotely secure).

  */

  if (strchr(udf->dl, '/') || IF_WIN(strchr(dl_name, '\\'),0))

  if (strchr(udf->dl, '/') || IF_WIN(strchr(udf->dl, '\\'),0))

  {

    my_message(ER_UDF_NO_PATHS, ER(ER_UDF_NO_PATHS), MYF(0));

    DBUG_RETURN(1);