--- rpms/e-smith-mysql/sme9/e-smith-mysql.spec	2014/02/02 20:19:03	1.6
+++ rpms/e-smith-mysql/sme9/e-smith-mysql.spec	2014/04/15 14:36:54	1.9
@@ -1,10 +1,10 @@
-# $Id: e-smith-mysql.spec,v 1.5 2013/06/06 17:17:30 vip-ire Exp $
+# $Id: e-smith-mysql.spec,v 1.8 2014/03/18 02:45:23 wellsi Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.4.0
-%define release 6
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,7 @@ Patch2: e-smith-mysql-2.4.0-mysqlUpgrade
 Patch3: e-smith-mysql-2.4.0-preBackup.patch
 Patch4: e-smith-mysql-2.4.0-ignore_event_table.patch
 Patch5: e-smith-mysql-2.4.0-ColumnCount.patch
+Patch6: e-smith-mysql-2.4.0-information_schema.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: mysql-server
@@ -25,6 +26,13 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Mon Apr 14 2014 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Remove the information_schema [SME: 8325]
+
+* Mon Mar 17 2014 Ian Wells <esmith@wellsi.com> 2.4.0-7.sme
+- Use mysql_upgrade in 00_restore_dumped_dbs, by Terje Edseth [SME: 8166]
+- Rename 10fix_privilege_tables to 10mysql_upgrade to reduce confusion.
+
 * Sun Feb 2 2014 Ian Wells <esmith@wellsi.com> 2.4.0-6.sme
 - Use mysql_upgrade --force due to upgrade to MySQL 5.1 [SME: 8166]
 
@@ -708,6 +716,7 @@ mysql.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -734,6 +743,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 # mysql.com compatibility
 [ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld
+# We remove this because the template has been renamed
+/bin/rm -f /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/sql/init/10fix_privilege_tables
+
 
 %postun
 if [ "$1" == 0 ]; then