Merge "Call parent::__construct() in MysqlBase AFTER transferring specific parameters"

diff --combined includes/libs/rdbms/database/DatabaseMysqlBase.php
index fb5fed7,e55680a..9662a5b
--- 1/includes/libs/rdbms/database/DatabaseMysqlBase.php
--- 2/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@@ -72,8 -72,6 +72,6 @@@ abstract class DatabaseMysqlBase extend
         * @param array $params
         */
        function __construct( array $params ) {
-               parent::__construct( $params );
- 
                $this->lagDetectionMethod = isset( $params['lagDetectionMethod'] )
                        ? $params['lagDetectionMethod']
                        : 'Seconds_Behind_Master';
@@@ -89,6 -87,8 +87,8 @@@
                }
                $this->sqlMode = isset( $params['sqlMode'] ) ? $params['sqlMode'] : '';
                $this->utf8Mode = !empty( $params['utf8Mode'] );
+ 
+               parent::__construct( $params );
        }
  
        /**
@@@ -608,16 -608,6 +608,16 @@@
         */
        abstract protected function mysqlRealEscapeString( $s );
  
 +      public function addQuotes( $s ) {
 +              if ( is_bool( $s ) ) {
 +                      // Parent would transform to int, which does not play nice with MySQL type juggling.
 +                      // When searching for an int in a string column, the strings are cast to int, which
 +                      // means false would match any string not starting with a number.
 +                      $s = (string)(int)$s;
 +              }
 +              return parent::addQuotes( $s );
 +      }
 +
        /**
         * MySQL uses `backticks` for identifier quoting instead of the sql standard "double quotes".
         *