regen master

diff --git a/OPTIONS b/OPTIONS
index 93cfef1265b556f4afcaafb2e5e879ec25353453..317f2c35676115c27480d80e19bd95f0feb4de1c 100644 (file)
--- a/OPTIONS
+++ b/OPTIONS
@@ -25,5 +25,6 @@ Setting                   Description
                           Disable the use of inline functions to implement
 -DISC_BUFFER_USEINLINE=0  the isc_buffer API: this reduces performance but
                           may be useful when debugging
--DISC_HEAP_CHECK          Test heap consistency after every heap operation;
-                          used when debugging
+-DISC_HEAP_CHECK          Test heap consistency after every heap
+                          operation; used when debugging
+

diff --git a/configure b/configure
index 182c553879a65cb6915d79a22f4e33d1b6784de5..cf54c28b381adfcdc549bcae17075e0606b03678 100755 (executable)
--- a/configure
+++ b/configure
@@ -22920,7 +22920,11 @@ else
 fi
 
 
-for ac_prog in mysql_config
+mysql_include=""
+mysql_lib=""
+if test "$use_dlz_mysql" = "yes"
+then
+       for ac_prog in mysql_config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -22962,11 +22966,6 @@ fi
   test -n "$MYSQL_CONFIG" && break
 done
 
-
-mysql_include=""
-mysql_lib=""
-if test "$use_dlz_mysql" = "yes"
-then
        if test -n "$MYSQL_CONFIG"
        then
                mysql_include=`${MYSQL_CONFIG} --include`