| Index: branches/REL1_18/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -703,9 +703,12 @@ |
| 704 | 704 | return $this->query( "DROP TABLE IF EXISTS " . $this->tableName( $tableName ), $fName ); |
| 705 | 705 | } |
| 706 | 706 | |
| | 707 | + /** |
| | 708 | + * @return array |
| | 709 | + */ |
| 707 | 710 | protected function getDefaultSchemaVars() { |
| 708 | 711 | $vars = parent::getDefaultSchemaVars(); |
| 709 | | - $vars['wgDBTableOptions'] = $GLOBALS['wgDBTableOptions']; |
| | 712 | + $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] ); |
| 710 | 713 | return $vars; |
| 711 | 714 | } |
| 712 | 715 | |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 713 | 716 | Merged /trunk/phase3/includes:r101451 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 714 | 717 | Merged /trunk/phase3:r101451 |