https://www.mediawiki.org/wiki/Special:Code/MediaWiki/101899
Revision: 101899
Author: reedy
Date: 2011-11-03 22:36:41 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
MFT r101451
Modified Paths:
--------------
branches/REL1_18/phase3/includes/db/DatabaseMysql.php
Property Changed:
----------------
branches/REL1_18/phase3/
branches/REL1_18/phase3/includes/
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97604,98962,98971,99004,99065
/trunk/phase3:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93726,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94155,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96437-96438,96579,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98610,98612,98656,98665,98669,98676,98678,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99031,99081-99082,99091,99102,99104,99118,99126,99135-99136,99138,99154,99172,99250,99252,99254,99286,99304,99308,99318,99321,99323,99332,99349,99353,99370-99371,99396,99630,99632,99653,99680,99694,99700,99897,99910,99914,99931,99952,99994,100021,100115,100219,100221,100223,100226,100239,100242,100347,100391,100398,100510,100572,100592,100701,101010,101306,101449-101450,101454
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97604,98962,98971,99004,99065
/trunk/phase3:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93726,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94155,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96437-96438,96579,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98610,98612,98656,98665,98669,98676,98678,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99031,99081-99082,99091,99102,99104,99118,99126,99135-99136,99138,99154,99172,99250,99252,99254,99286,99304,99308,99318,99321,99323,99332,99349,99353,99370-99371,99396,99630,99632,99653,99680,99694,99700,99897,99910,99914,99931,99952,99994,100021,100115,100219,100221,100223,100226,100239,100242,100347,100391,100398,100510,100572,100592,100701,101010,101306,101449-101451,101454
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:98962,98971,99004,99065
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93726,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94155,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96437-96438,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98610,98612,98656,98676,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99081-99082,99102,99104,99118,99126,99135-99136,99138,99172,99250,99252,99254,99286,99304,99308,99318,99323,99332,99349,99370-99371,99630,99632,99680,99694,99700,99897,99910,99914,99931,99952,100021,100115,100219,100221,100223,100226,100239,100242,100347,100398,100510,100572,100592,100701,101010,101306,101449-101450,101454
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:98962,98971,99004,99065
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93726,93818-93822,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94155,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96437-96438,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98610,98612,98656,98676,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99081-99082,99102,99104,99118,99126,99135-99136,99138,99172,99250,99252,99254,99286,99304,99308,99318,99323,99332,99349,99370-99371,99630,99632,99680,99694,99700,99897,99910,99914,99931,99952,100021,100115,100219,100221,100223,100226,100239,100242,100347,100398,100510,100572,100592,100701,101010,101306,101449-101451,101454
Modified: branches/REL1_18/phase3/includes/db/DatabaseMysql.php
===================================================================
--- branches/REL1_18/phase3/includes/db/DatabaseMysql.php 2011-11-03
22:32:49 UTC (rev 101898)
+++ branches/REL1_18/phase3/includes/db/DatabaseMysql.php 2011-11-03
22:36:41 UTC (rev 101899)
@@ -703,9 +703,12 @@
return $this->query( "DROP TABLE IF EXISTS " .
$this->tableName( $tableName ), $fName );
}
+ /**
+ * @return array
+ */
protected function getDefaultSchemaVars() {
$vars = parent::getDefaultSchemaVars();
- $vars['wgDBTableOptions'] = $GLOBALS['wgDBTableOptions'];
+ $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE',
$GLOBALS['wgDBTableOptions'] );
return $vars;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
