Improved the support for MySQL InnoDB engine

Geeklog-Core · Feb 17, 2017 · 53c554e · 53c554e
1 parent 91ed41e
commit 53c554e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php
@@ -1113,7 +1113,7 @@ private function autoInstallPlugin($plugin, array $inst_params, $verbose = true)
 
             foreach ($_SQL as $sql) {
                 if ($useInnodb) {
-                    $sql = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB', $sql);
+                    $sql = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB ROW_FORMAT=DYNAMIC', $sql);
                 }
                 $sql = str_replace('#group#', $adminGroupId, $sql);
                 DB_query($sql);
@@ -1372,7 +1372,7 @@ public function pluginAutoInstall($plugin, $inst_params, $verbose = true)
 
             foreach ($_SQL as $sql) {
                 if ($use_innodb) {
-                    $sql = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB', $sql);
+                    $sql = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB ROW_FORMAT=DYNAMIC', $sql);
                 }
                 $sql = str_replace('#group#', $admin_group_id, $sql);
                 DB_query($sql);
@@ -2087,7 +2087,7 @@ private function createDatabaseStructures()
                 if ($this->env['use_innodb']) {
                     $dbTableAndData = @file_get_contents($dbTableAndDataPath);
                     $dbTableAndData = str_replace('<' . '?php', '', $dbTableAndData);
-                    $dbTableAndData = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB', $dbTableAndData);
+                    $dbTableAndData = preg_replace('/ENGINE\s*=\s*MyISAM/i', 'ENGINE=InnoDB ROW_FORMAT=DYNAMIC', $dbTableAndData);
                     eval($dbTableAndData);
                 } else {
                     require_once $dbTableAndDataPath;

diff --git a/system/databases/mysql.class.php b/system/databases/mysql.class.php
@@ -418,12 +418,12 @@ public function dbQuery($sql, $ignore_errors = 0)
                     $option = str_ireplace('type', 'ENGINE', $option);
 
                     if ($this->_use_innodb === true) {
-                        $option = str_ireplace('MyISAM', 'InnoDB', $option);
+                        $option = str_ireplace('MyISAM', 'InnoDB ROW_FORMAT=DYNAMIC', $option);
                     }
                 } else {
                     // Appends engine type
                     $option = ' ENGINE='
-                        . (($this->_use_innodb === true) ? 'InnoDB' : 'MyISAM');
+                        . (($this->_use_innodb === true) ? 'InnoDB ROW_FORMAT=DYNAMIC' : 'MyISAM');
                 }
 
                 // Appends default charset if necessary

diff --git a/system/databases/mysqli.class.php b/system/databases/mysqli.class.php
@@ -428,12 +428,12 @@ public function dbQuery($sql, $ignore_errors = 0)
                     $option = str_ireplace('type', 'ENGINE', $option);
 
                     if ($this->_use_innodb === true) {
-                        $option = str_ireplace('MyISAM', 'InnoDB', $option);
+                        $option = str_ireplace('MyISAM', 'InnoDB ROW_FORMAT=DYNAMIC', $option);
                     }
                 } else {
                     // Appends engine type
                     $option = ' ENGINE='
-                        . (($this->_use_innodb === true) ? 'InnoDB' : 'MyISAM');
+                        . (($this->_use_innodb === true) ? 'InnoDB ROW_FORMAT=DYNAMIC' : 'MyISAM');
                 }
 
                 // Appends default charset if necessary