Changeset 36055

Timestamp:

12/21/2015 10:26:52 PM (9 years ago)

Author:

pento

Message:

Tests: Use the default_storage_engine MySQL option on newer MySQL versions.

In MySQL 5.5.3, storage_engine was deprecated in favour of default_storage_engine, and subsequently removed in MySQL 5.7. To avoid errors when running tests on MySQL 5.7, we need to switch between the options based on MySQL version.

Props skithund, jeremyfelt.

Fixes #34692.

File:

• trunk/tests/phpunit/includes/install.php (modified) (1 diff)

trunk/tests/phpunit/includes/install.php

@@ -32 +32 @@
 $phpmailer = new MockPHPMailer();
 
-$wpdb->query( 'SET storage_engine = INNODB' );
+/*
+ * default_storage_engine and storage_engine are the same option, but storage_engine
+ * was deprecated in MySQL (and MariaDB) 5.5.3, and removed in 5.7.
+ */
+if ( version_compare( $wpdb->db_version(), '5.5.3', '>=' ) ) {
+    $wpdb->query( 'SET default_storage_engine = InnoDB' );
+} else {
+    $wpdb->query( 'SET storage_engine = InnoDB' );
+}
 $wpdb->select( DB_NAME, $wpdb->dbh );