Changeset 97 for trunk

Timestamp:

Mar 20, 2007, 11:32:11 PM (18 years ago)

Author:

rainer

Message:

Fix for ticket #56 (workaround for libmysql/x86-64 bug with mysql_options).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/sh_database.c (modified) (1 diff)
• test/testrun_1b.sh (modified) (1 diff)

trunk/configure.ac

@@ -2407 +2407 @@
 echo "ac_cv_sizeof_char_p         size of pointer to char ${ac_cv_sizeof_char_p}"
 echo "ac_cv_sizeof_char_p         size of size_t          ${ac_cv_sizeof_size_t}"
-echo "ac_cv_sizeof_unsigned_int_  size of unsigned int    ${ac_cv_sizeof_unsigned_int_}"
+echo "ac_cv_sizeof_unsigned_int   size of unsigned int    ${ac_cv_sizeof_unsigned_int}"
 echo "ac_cv_sizeof_unsigned_long  size of unsigned long   ${ac_cv_sizeof_unsigned_long}"
 echo "ac_cv_sizeof_unsigned_short size of unsigned short  ${ac_cv_sizeof_unsigned_short}"

trunk/src/sh_database.c

@@ -1100 +1100 @@
        * to lack of access permission is not reported).
        */
+#if !defined(__x86_64__)
+      /* 
+       *   libmysql segfaults on x86-64 if this is used
+       */
       mysql_options(db_conn, MYSQL_READ_DEFAULT_GROUP, _("samhain"));
+#endif
 
       status = 0;

trunk/test/testrun_1b.sh

@@ -246 +246 @@
             # -------------  third test -------------
             #
-            if test "x$hostname" = "xtenebra"
+            if test -f /usr/local/lib/libprelude.so
             then
-                if test -f /usr/local/lib/libprelude.so
-                then
                     LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
                     export LD_LIBRARY_PATH
-                fi
             fi
             #