From: <gi...@ba...> - 2016-07-03 10:20:55
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Bacula Community source". The branch, Branch-7.4 has been updated via 361f45e671198d5dc56fe3729127b032b508cb42 (commit) via e0b430ca694f47c5088edda9fd6c9015a1815bc6 (commit) from da0d7005410cf06a61d0357ddf8ee30d8bc374bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 361f45e671198d5dc56fe3729127b032b508cb42 Author: Kern Sibbald <ke...@si...> Date: Sun Jul 3 12:20:24 2016 +0200 Recompile configure after db.m4 change commit e0b430ca694f47c5088edda9fd6c9015a1815bc6 Author: Kern Sibbald <ke...@si...> Date: Sun Jul 3 12:19:36 2016 +0200 Fix batch insert for MySQL 5.7 ----------------------------------------------------------------------- Summary of changes: diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index 6ca82a0..4e9007d 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -485,6 +485,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" MYSQL_LIBS="$MYSQL_LIBDIR" MYSQL_INCLUDE="$MYSQL_INCDIR" + AC_DEFINE(HAVE_MYSQL_THREAD_SAFE, 1, [Set if have mysql_thread_safe]) if test -z "${batch_insert_db_backends}"; then batch_insert_db_backends="MySQL" else diff --git a/bacula/configure b/bacula/configure index b190c97..78b3fef 100755 --- a/bacula/configure +++ b/bacula/configure @@ -24258,6 +24258,9 @@ $as_echo "no" >&6; } DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}" MYSQL_LIBS="$MYSQL_LIBDIR" MYSQL_INCLUDE="$MYSQL_INCDIR" + +$as_echo "#define HAVE_MYSQL_THREAD_SAFE 1" >>confdefs.h + if test -z "${batch_insert_db_backends}"; then batch_insert_db_backends="MySQL" else hooks/post-receive -- Bacula Community source |