Title: [opsview] [9657] In the output of mysqldump, replace TYPE= with ENGINE=.
Revision
9657
Author
pknight
Date
2012-07-30 15:41:59 +0100 (Mon, 30 Jul 2012)

Log Message

In the output of mysqldump, replace TYPE= with ENGINE=. This is to support MySQL 5.5+, and we can remove this when we know that all systems are using 5.5 minimum.

Modified Paths

Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview	2012-07-30 13:59:37 UTC (rev 9656)
+++ trunk/opsview-core/bin/db_opsview	2012-07-30 14:41:59 UTC (rev 9657)
@@ -1297,11 +1297,11 @@
 		#eval mysqldump $user_parms -l --ignore-table $db.sessions --ignore-table $db.api_sessions --ignore-table $db.temporary_hostmonitoredbynode --ignore-table $db.snmpwalkcache --databases $db
         # instead remove the data while its being produced.  Will take longer
         # but will at least contain all table definitions
-		eval mysqldump $user_parms -l --databases $db | perl -n -e 'print unless(m/INSERT INTO `(?:sessions|api_sessions|temporary_hostmonitoredbynode|snmpwalkcache )`/);'
+		eval mysqldump $user_parms -l --databases $db | perl -n -e 'print unless(m/INSERT INTO `(?:sessions|api_sessions|temporary_hostmonitoredbynode|snmpwalkcache )`/)' | sed 's/ TYPE=/ ENGINE=/'
 	else
         # Use --compatible to ensure that the output is the same across different versions of mysql
         # Other changes here to keep consistency between different platforms
-        eval mysqldump $user_parms --skip-extended-insert -l --compatible=mysql40 --databases $db | egrep -v ^-- | egrep -v 'SET @saved_cs_client|SET character_set_client|^INSERT INTO `(auditlogs|reloadmessages|temporary_hostmonitoredbynode|useragents|snmpwalkcache|sessions|api_sessions|monitor_packs)`' | perl -pe 's/ AUTO_INCREMENT=\d+//; s/`'$db'`/`opsview`/g; s/PRIMARY KEY\s+\(/PRIMARY KEY \(/g; s/ auto_increment,/ AUTO_INCREMENT,/g; s/ default / DEFAULT /g'
+        eval mysqldump $user_parms --skip-extended-insert -l --compatible=mysql40 --databases $db | egrep -v ^-- | egrep -v 'SET @saved_cs_client|SET character_set_client|^INSERT INTO `(auditlogs|reloadmessages|temporary_hostmonitoredbynode|useragents|snmpwalkcache|sessions|api_sessions|monitor_packs)`' | perl -pe 's/ AUTO_INCREMENT=\d+//; s/`'$db'`/`opsview`/g; s/PRIMARY KEY\s+\(/PRIMARY KEY \(/g; s/ auto_increment,/ AUTO_INCREMENT,/g; s/ default / DEFAULT /g' | sed 's/ TYPE=/ ENGINE=/'
 	fi
 }
 

_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to