| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -509,7 +509,7 @@ |
| 510 | 510 | function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'Database::insertSelect', |
| 511 | 511 | $insertOptions = array(), $selectOptions = array() ) |
| 512 | 512 | { |
| 513 | | - $ret = parent::insertSelect( $destTable, $srcTable, $varMap, $conds, $fname, insertOptions, $selectOptions ); |
| | 513 | + $ret = parent::insertSelect( $destTable, $srcTable, $varMap, $conds, $fname, $insertOptions, $selectOptions ); |
| 514 | 514 | |
| 515 | 515 | if ( $ret === false ) { |
| 516 | 516 | throw new DBQueryError( $this, $this->getErrors(), $this->lastErrno(), $sql, $fname ); |
| — | — | @@ -814,7 +814,7 @@ |
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | function setup_database() { |
| 818 | | - global $wgVersion, $wgDBmwschema, $wgDBts2schema, $wgDBport, $wgDBuser; |
| | 818 | + global $wgVersion, $wgDBmwschema, $wgDBport, $wgDBuser; |
| 819 | 819 | |
| 820 | 820 | // Make sure that we can write to the correct schema |
| 821 | 821 | $ctest = "mediawiki_test_table"; |