[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3761 - in branches/OpenDNSSEC-sion/enforcer/ksm: . include/ksm

Sion Lloyd sion at nominet.org.uk
Mon Aug 16 15:13:41 CEST 2010


Author: sion
Date: 2010-08-16 15:13:41 +0200 (Mon, 16 Aug 2010)
New Revision: 3761

Modified:
   branches/OpenDNSSEC-sion/enforcer/ksm/database_connection_mysql.c
   branches/OpenDNSSEC-sion/enforcer/ksm/include/ksm/database.h
Log:
make MySQL check DB version number, bump the number up to 2.


Modified: branches/OpenDNSSEC-sion/enforcer/ksm/database_connection_mysql.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/ksm/database_connection_mysql.c	2010-08-16 10:53:08 UTC (rev 3760)
+++ branches/OpenDNSSEC-sion/enforcer/ksm/database_connection_mysql.c	2010-08-16 13:13:41 UTC (rev 3761)
@@ -157,6 +157,11 @@
 		*dbhandle = (DB_HANDLE) connection;
 	}
 
+    /* Check the version against what we have in database.h */
+    if (status == 0) {
+        status = db_version_check();
+    }
+
     return status;
 }
 

Modified: branches/OpenDNSSEC-sion/enforcer/ksm/include/ksm/database.h
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/ksm/include/ksm/database.h	2010-08-16 10:53:08 UTC (rev 3760)
+++ branches/OpenDNSSEC-sion/enforcer/ksm/include/ksm/database.h	2010-08-16 13:13:41 UTC (rev 3761)
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 
-#define KSM_DB_VERSION 1    /* This needs to match that given in the dbadmin table */
+#define KSM_DB_VERSION 2    /* This needs to match that given in the dbadmin table */
 
 #define MYSQL_DB 1
 #define SQLITE_DB 2




More information about the Opendnssec-commits mailing list