From 59b5c9bf66f47bad1ac200c51fc3cc6fb82b13eb Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 30 Jun 2005 17:33:23 +0200
Subject: [PATCH 1/2] - backport of a compile fix from 4.1
 (ChangeSet@1.2260.23.2 2005/05/19 from reggie)   "changed dl_name to udf->dl
 in mysql_create_function"

---
 sql/sql_udf.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 556e015e111..84156ff4022 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -405,7 +405,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))
   {
     send_error(&thd->net, ER_UDF_NO_PATHS,ER(ER_UDF_NO_PATHS));
     DBUG_RETURN(1);

From c760d27cf1eb14d9b3c3d5ad66e687ede9f5fd20 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Mon, 4 Jul 2005 12:58:53 +0200
Subject: [PATCH 2/2] - bumped up version number in configure.in to 4.0.26

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 5af41d29c21..83685009ee6 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 4.0.25)
+AM_INIT_AUTOMAKE(mysql, 4.0.26)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10