[Rt-commit] [svn] r1173 - rt/branches/rt-3.1

[alexmv at pallas.eruditorum.org]

Author: alexmv
Date: Thu Jul  1 09:40:57 2004
New Revision: 1173

Modified:
   rt/branches/rt-3.1/README
   rt/branches/rt-3.1/configure.ac
Log:
RT-Ticket: 5799
RT-Status: resolved
RT-Action: correspond

 * Explicitly require InnoDB if using MySQL



Modified: rt/branches/rt-3.1/README
==============================================================================
--- rt/branches/rt-3.1/README	(original)
+++ rt/branches/rt-3.1/README	Thu Jul  1 09:40:57 2004
@@ -49,7 +49,7 @@
 	    is unsupported in that configuration.
 
 o   A DB backend; MySQL is recommended ( http://www.mysql.com ) 
-        Currently supported:  Mysql 4.0.13 or later. 
+        Currently supported:  Mysql 4.0.13 or later with InnoDB support.
                               Postgres 7.2 or later.
                               Oracle 9iR2.
         Beta-quality support for Informix and SQLite is also available.

Modified: rt/branches/rt-3.1/configure.ac
==============================================================================
--- rt/branches/rt-3.1/configure.ac	(original)
+++ rt/branches/rt-3.1/configure.ac	Thu Jul  1 09:40:57 2004
@@ -86,6 +86,11 @@
 fi
 AC_SUBST(DB_TYPE)
 
+dnl Require InnoDB support with mysql
+if test "$DB_TYPE" = 'mysql'; then
+	test `mysqladmin variables | grep have_innodb | grep YES -c` = '0' && AC_MSG_ERROR([MySQL must have InnoDB support])
+fi
+
 dnl DATABASE_ENV_PREF
 if test "$DB_TYPE" = 'Oracle'; then
 	test "x$ORACLE_HOME" = 'x' && AC_MSG_ERROR([Please declare the ORACLE_HOME environment variable])