<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47195] trunk/tests/phpunit/tests/dbdelta.php: Tests: In `Tests_dbDelta`, only force MyISAM database engine on MySQL versions older than 5.7.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47195">47195</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47195","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-05 22:05:50 +0000 (Wed, 05 Feb 2020)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: In `Tests_dbDelta`, only force MyISAM database engine on MySQL versions older than 5.7.

Since MySQL 5.7, InnoDB engine supports `FULLTEXT` indexes, so forcing MyISAM is unnecessary.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/47193">[47193]</a>, which addressed the issue in `Tests_dbDelta::setUp()`, but missed other tests.

Props xkon, joonasvanhatapio, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/49367">#49367</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsdbdeltaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dbdelta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dbdelta.php     2020-02-05 19:07:33 UTC (rev 47194)
+++ trunk/tests/phpunit/tests/dbdelta.php       2020-02-05 22:05:50 UTC (rev 47195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">        protected $max_index_length = 191;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Database engine used for creating tables.
+        *
+        * Prior to MySQL 5.7, InnoDB did not support FULLTEXT indexes, so MyISAM is used instead.
+        */
+       protected $db_engine = '';
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Display width for BIGINT data type.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * Prior to MySQL 8.0.17, default width of 20 digits was used: BIGINT(20).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,11 +47,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $db_version = $wpdb->db_version();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $db_engine  = '';
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( version_compare( $db_version, '5.7', '<' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Forcing MyISAM, because InnoDB only started supporting FULLTEXT indexes in MySQL 5.7.
-                       $db_engine = 'ENGINE=MyISAM';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Prior to MySQL 5.7, InnoDB did not support FULLTEXT indexes, so MyISAM is used instead.
+                       $this->db_engine = 'ENGINE=MyISAM';
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( version_compare( $db_version, '8.0.17', '<' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        KEY compound_key (id,column_1(%d)),
</span><span class="cx" style="display: block; padding: 0 10px">                                        FULLTEXT KEY fulltext_key (column_1)" .
</span><span class="cx" style="display: block; padding: 0 10px">                                        // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ") $db_engine
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ") {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                                 ",
</span><span class="cx" style="display: block; padding: 0 10px">                                $this->max_index_length,
</span><span class="cx" style="display: block; padding: 0 10px">                                $this->max_index_length
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +602,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                spatial_value {$geomcollection_name} NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY non_spatial (non_spatial),
</span><span class="cx" style="display: block; padding: 0 10px">                                SPATIAL KEY spatial_key (spatial_value)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine};
</ins><span class="cx" style="display: block; padding: 0 10px">                         ";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY non_spatial (non_spatial),
</span><span class="cx" style="display: block; padding: 0 10px">                                SPATIAL KEY spatial_key (spatial_value)
</span><span class="cx" style="display: block; padding: 0 10px">                                SPATIAL KEY spatial_key2 (spatial_value2)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine};
</ins><span class="cx" style="display: block; padding: 0 10px">                         ";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $updates = dbDelta( $schema, false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,7 +685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id , column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key2 (id,`references`($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,7 +731,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                UNIQUE KEY key_3 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                UNIQUE INDEX key_4 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT INDEX key_5 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                 ";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $creates = dbDelta( $schema );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +766,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                INDEX key_1 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                INDEX compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT INDEX fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,7 +791,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_2 (column_1(10)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_3 (column_2(100),column_1(10)),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                 ";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $creates = dbDelta( $schema );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1($this->max_index_length) DESC),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length) ASC),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -842,7 +848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,7 +872,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1        (         column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,      column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +896,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                key key_1 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                key compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -914,7 +920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY KEY_1 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compOUND_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY FULLtext_kEY (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -939,7 +945,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_1 (column_1({$this->max_index_length})),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         ",
</span><span class="cx" style="display: block; padding: 0 10px">                        false
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,7 +971,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY changing_key_length (column_1(20)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,7 +994,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY changing_key_length (column_1(50)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1006,7 +1012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY changing_key_length (column_1(1)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1024,7 +1030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY compound_key (id,column_1),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY changing_key_length (column_1),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ) ENGINE=MyISAM
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ) {$this->db_engine}
</ins><span class="cx" style="display: block; padding: 0 10px">                         "
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>