Disable building the innodb plugin

mysql.spec

@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.42
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -203,6 +203,8 @@ export CFLAGS CXXFLAGS
 
 # mysql 5.1.30 fails regression tests on x86 unless we use --with-big-tables,
 # suggesting that upstream doesn't bother to test the other case ...
+# note: the with-plugin and without-plugin options do actually work; ignore
+# warnings from configure suggesting they are ignored ...
 %configure \
 	--with-readline \
 	--with-ssl=/usr \
@@ -217,6 +219,7 @@ export CFLAGS CXXFLAGS
 	--with-pic \
 	--with-plugin-innobase \
 	--with-plugin-ndbcluster \
+	--without-plugin-innodb_plugin \
 	--enable-local-infile \
 	--enable-largefile \
 	--enable-thread-safe-client \
@@ -649,6 +652,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Jan  2 2010 Tom Lane <tgl@redhat.com> 5.1.42-2
+- Disable building the innodb plugin; it tickles assorted gcc bugs and
+  doesn't seem entirely ready for prime time anyway.
+
 * Fri Jan  1 2010 Tom Lane <tgl@redhat.com> 5.1.42-1
 - Update to MySQL 5.1.42, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html