You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/02/25 01:28:55 UTC
svn commit: r747626 - in /apr/apr-util/branches/1.3.x: ./ CHANGES
build/dbd.m4 dbd/apr_dbd_mysql.c dbd/apr_dbd_pgsql.c
Author: bojan
Date: Wed Feb 25 00:28:55 2009
New Revision: 747626
URL: http://svn.apache.org/viewvc?rev=747626&view=rev
Log:
Backport 747623 from the trunk.
Use of my_init() requires my_global.h and my_sys.h.
Modified:
apr/apr-util/branches/1.3.x/ (props changed)
apr/apr-util/branches/1.3.x/CHANGES
apr/apr-util/branches/1.3.x/build/dbd.m4
apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (props changed)
Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 00:28:55 2009
@@ -1,2 +1,2 @@
/apr/apr-util/branches/1.3.x:692751
-/apr/apr-util/trunk:692751,731225,743986,744009,745771,747612
+/apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623
Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=747626&r1=747625&r2=747626&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Wed Feb 25 00:28:55 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.3.5
+ *) Use of my_init() requires my_global.h and my_sys.h.
+ [Bojan Smojver]
+
*) Fix apr_memcache_multgetp memory corruption and incorrect error
handling. PR 46588 [Sami Tolvanen <sami.tolvanen mywot.com>]
Modified: apr/apr-util/branches/1.3.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbd.m4?rev=747626&r1=747625&r2=747626&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dbd.m4 Wed Feb 25 00:28:55 2009
@@ -176,9 +176,15 @@
APR_ADDTO(LIBS, [$mysql_LIBS])
fi
- AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
+ AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
+ AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ [apu_have_mysql=0; break],
+ [#include <my_global.h>])
if test "$apu_have_mysql" = "0"; then
- AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
+ AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ [apu_have_mysql=0; break],
+ [#include <mysql/my_global.h>])
fi
if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
@@ -201,10 +207,16 @@
APR_ADDTO(LIBS, [$mysql_LIBS])
AC_MSG_NOTICE(checking for mysql in $withval)
- AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
+ AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
+ AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ [apu_have_mysql=0; break],
+ [#include <my_global.h>])
if test "$apu_have_mysql" != "1"; then
- AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
+ AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
+ AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ [apu_have_mysql=0; break],
+ [#include <mysql/my_global.h>])
fi
if test "$apu_have_mysql" != "0"; then
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c?rev=747626&r1=747625&r2=747626&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c Wed Feb 25 00:28:55 2009
@@ -25,6 +25,16 @@
#include <ctype.h>
#include <stdlib.h>
+#ifdef HAVE_MY_GLOBAL_H
+#include <my_global.h>
+#elif defined(HAVE_MYSQL_MY_GLOBAL_H)
+#include <mysql/my_global.h>
+#endif
+#ifdef HAVE_MY_SYS_H
+#include <my_sys.h>
+#elif defined(HAVE_MYSQL_MY_SYS_H)
+#include <mysql/my_sys.h>
+#endif
#ifdef HAVE_MYSQL_H
#include <mysql.h>
#include <errmsg.h>
Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 00:28:55 2009
@@ -1,2 +1,2 @@
/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
-/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612
+/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623