DataObjects/Core_enum.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 7441e4f..068c1c7 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -341,6 +341,9 @@ class Pman_Core_UpdateDatabase extends Pman
     
     function importmysqldir($dburl, $dir)
     {
+        
+        $this->fixMysqlInnodb(); /// run once 
+        
         echo "Import MYSQL :: $dir\n";
         
         
@@ -733,15 +736,11 @@ class Pman_Core_UpdateDatabase extends Pman
         $db = DB_DataObject::factory('core_enum');
         $db->query("show variables like 'innodb_file_per_table'");
         $db->fetch();
-        var_dump($db);
-        // Value should == ON
-        
-        // I think it needs to look in the mysql directory.... to see if the idb exists..
-        $db = DB_DataObject::factory('core_enum');
-        $db->query("SHOW TABLE STATUS");
-        // Engine should be InnoDB - and file XXX.idb should exist...
-        
+        if ($db->Value == 'OFF') {
+            die("Error: set innodb_file_per_table = 1 in my.cnf\n\n");
+        }
         
+        $done_check = true;;