diff options
| author | unknown <ndbdev@dl145c.mysql.com> | 2005-05-23 10:45:48 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145c.mysql.com> | 2005-05-23 10:45:48 +0200 |
| commit | 8128e3e417e15489f61ad783182d7affc579330a (patch) | |
| tree | 3ddbb7a46932f6419027b1a071af6b7cbcdf4c94 /sql/sql_udf.cc | |
| parent | a1e3d7ef83c6d14a2acfc0f7c9022e39354cccba (diff) | |
| parent | 982bd00d481333c44e6aee59fc667f8de155a612 (diff) | |
| download | mariadb-git-8128e3e417e15489f61ad783182d7affc579330a.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/ha_innodb.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/rt_split.c:
Auto merged
storage/myisam/sp_key.c:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
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 575d75380eb..1e81a2783bb 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); |