diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-19 15:50:44 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-19 15:50:44 -0500 |
| commit | c321b2ba6efd6930007b8992546989efa2658878 (patch) | |
| tree | e56114ec7d0e8f209133396741706f6c0efa07fe /sql/sql_udf.cc | |
| parent | 0100b28de82094e9d2b452c6ede7c1451e3caffe (diff) | |
| parent | f4a584f5013373f3c939df7cd7ef7ab444b18168 (diff) | |
| download | mariadb-git-c321b2ba6efd6930007b8992546989efa2658878.tar.gz | |
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
sql/spatial.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index ebd753da9cf..1e1a5683d09 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -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); |