Merge "installer: Replace bad calls to getText() on DBQueryError exceptions"

diff --combined includes/installer/MysqlInstaller.php
index 4f0b66c,64a4077..cbb79f8
--- 1/includes/installer/MysqlInstaller.php
--- 2/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@@ -179,8 -179,8 +179,8 @@@ class MysqlInstaller extends DatabaseIn
  
                # Determine existing default character set
                if ( $conn->tableExists( "revision", __METHOD__ ) ) {
 -                      $revision = $conn->buildLike( $this->getVar( 'wgDBprefix' ) . 'revision' );
 -                      $res = $conn->query( "SHOW TABLE STATUS $revision", __METHOD__ );
 +                      $revision = $this->escapeLikeInternal( $this->getVar( 'wgDBprefix' ) . 'revision', '\\' );
 +                      $res = $conn->query( "SHOW TABLE STATUS LIKE '$revision'", __METHOD__ );
                        $row = $conn->fetchObject( $res );
                        if ( !$row ) {
                                $this->parent->showMessage( 'config-show-table-status' );
@@@ -221,16 -221,6 +221,16 @@@
                $wgDBpassword = $this->getVar( '_InstallPassword' );
        }
  
 +      /**
 +       * @param string $s
 +       * @return string
 +       */
 +      protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
 +              return str_replace( [ $escapeChar, '%', '_' ],
 +                      [ "{$escapeChar}{$escapeChar}", "{$escapeChar}%", "{$escapeChar}_" ],
 +                      $s );
 +      }
 +
        /**
         * Get a list of storage engines that are available and supported
         *
@@@ -584,7 -574,7 +584,7 @@@
                                                        // If we couldn't create for some bizzare reason and the
                                                        // user probably doesn't exist, skip the grant
                                                        $this->db->rollback( __METHOD__ );
-                                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getText() );
+                                                       $status->warning( 'config-install-user-create-failed', $dbUser, $dqe->getMessage() );
                                                }
                                        }
                                } else {
@@@ -604,7 -594,7 +604,7 @@@
                                $this->db->commit( __METHOD__ );
                        } catch ( DBQueryError $dqe ) {
                                $this->db->rollback( __METHOD__ );
-                               $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getText() );
+                               $status->fatal( 'config-install-user-grant-failed', $dbUser, $dqe->getMessage() );
                        }
                }