View | Details | Raw Unified | Return to bug 230538 | Differences between
and this patch

Collapse All | Expand All

(-)b/apr-util-1.6.1/dbd/apr_dbd_mysql.c (+7 lines)
Lines 47-52 Link Here
47
#include "apr_strings.h"
47
#include "apr_strings.h"
48
#include "apr_lib.h"
48
#include "apr_lib.h"
49
#include "apr_buckets.h"
49
#include "apr_buckets.h"
50
/* MySQL 8.0 replaces my_bool with C99 bool. Earlier versions of MySQL had
51
* a typedef to char. Gem users reported failures on big endian systems when
52
* using C99 bool types with older MySQLs due to mismatched behavior. */
53
#ifndef HAVE_TYPE_MY_BOOL
54
#include <stdbool.h>
55
typedef bool my_bool;
56
#endif
50
57
51
#include "apr_dbd_internal.h"
58
#include "apr_dbd_internal.h"
52
59
(-)b/apr-util-1.6.1/build/dbd.m4 (-8 / +8 lines)
Lines 176-190 Link Here
176
        APR_ADDTO(LIBS, [$mysql_LIBS])
176
        APR_ADDTO(LIBS, [$mysql_LIBS])
177
      fi
177
      fi
178
178
179
      AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
179
      AC_CHECK_HEADERS([mysql.h],
180
                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
180
                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
181
                       [apu_have_mysql=0; break],
181
                       [apu_have_mysql=0; break],
182
                       [#include <my_global.h>])
182
                       [#include <mysql.h>])
183
      if test "$apu_have_mysql" = "0"; then
183
      if test "$apu_have_mysql" = "0"; then
184
        AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
184
        AC_CHECK_HEADERS([mysql/mysql.h],
185
                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
185
                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
186
                         [apu_have_mysql=0; break],
186
                         [apu_have_mysql=0; break],
187
                         [#include <mysql/my_global.h>])
187
                         [#include <mysql/mysql.h>])
188
      fi
188
      fi
189
      if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
189
      if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
190
        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
190
        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
Lines 207-222 Link Here
207
      APR_ADDTO(LIBS, [$mysql_LIBS])
207
      APR_ADDTO(LIBS, [$mysql_LIBS])
208
208
209
      AC_MSG_NOTICE(checking for mysql in $withval)
209
      AC_MSG_NOTICE(checking for mysql in $withval)
210
      AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
210
      AC_CHECK_HEADERS([mysql.h],
211
                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
211
                       AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
212
                       [apu_have_mysql=0; break],
212
                       [apu_have_mysql=0; break],
213
                       [#include <my_global.h>])
213
                       [#include <mysql.h>])
214
214
215
      if test "$apu_have_mysql" != "1"; then
215
      if test "$apu_have_mysql" != "1"; then
216
        AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
216
        AC_CHECK_HEADERS([mysql/mysql.h],
217
                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
217
                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
218
                         [apu_have_mysql=0; break],
218
                         [apu_have_mysql=0; break],
219
                         [#include <mysql/my_global.h>])
219
                         [#include <mysql/mysql.h>])
220
      fi
220
      fi
221
      if test "$apu_have_mysql" != "0"; then
221
      if test "$apu_have_mysql" != "0"; then
222
        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
222
        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])

Return to bug 230538