Ticket #41335: 41335.diff

src/wp-admin/includes/upgrade.php

@@ -2736 +2736 @@
 
         // Create a tablename index for an array ($cqueries) of queries.
         foreach ( $queries as $qry ) {
-                if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
+                if ( preg_match( '/CREATE TABLE IF NOT EXISTS ([^ ]*)|CREATE TABLE ([^ ]*)/', $qry, $matches ) ) {
                         $cqueries[ trim( $matches[1], '`' ) ] = $qry;
                         $for_update[ $matches[1] ]            = 'Created table ' . $matches[1];
-                } elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
+                } elseif ( preg_match( '/CREATE DATABASE IF NOT EXISTS ([^ ]*)|CREATE DATABASE ([^ ]*)/', $qry, $matches ) ) {
                         array_unshift( $cqueries, $qry );
-                } elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
+                } elseif ( preg_match( '/INSERT INTO ([^ ]*)/', $qry, $matches ) ) {
                         $iqueries[] = $qry;
-                } elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
+                } elseif ( preg_match( '/UPDATE ([^ ]*)/', $qry, $matches ) ) {
                         $iqueries[] = $qry;
                 } else {
                         // Unrecognized query type.