dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Tweaked BagOStuff::lock() retry times slightly to be faster"
[lhc/web/wiklou.git]
/
includes
/
db
/
DatabaseMysqlBase.php
diff --git
a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index
7cd5525
..
7b903d6
100644
(file)
--- a/
includes/db/DatabaseMysqlBase.php
+++ b/
includes/db/DatabaseMysqlBase.php
@@
-71,8
+71,6
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
$this->mPassword = $password;
$this->mDBname = $dbName;
$this->mPassword = $password;
$this->mDBname = $dbName;
- wfProfileIn( "dbconnect-$server" );
-
# The kernel's default SYN retransmission period is far too slow for us,
# so we use a short timeout plus a manual retry. Retrying means that a small
# but finite rate of SYN packet loss won't cause user-visible errors.
# The kernel's default SYN retransmission period is far too slow for us,
# so we use a short timeout plus a manual retry. Retrying means that a small
# but finite rate of SYN packet loss won't cause user-visible errors.
@@
-81,14
+79,11
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
try {
$this->mConn = $this->mysqlConnect( $realServer );
} catch ( Exception $ex ) {
try {
$this->mConn = $this->mysqlConnect( $realServer );
} catch ( Exception $ex ) {
- wfProfileOut( "dbconnect-$server" );
$this->restoreErrorHandler();
throw $ex;
}
$error = $this->restoreErrorHandler();
$this->restoreErrorHandler();
throw $ex;
}
$error = $this->restoreErrorHandler();
- wfProfileOut( "dbconnect-$server" );
-
# Always log connection errors
if ( !$this->mConn ) {
if ( !$error ) {
# Always log connection errors
if ( !$this->mConn ) {
if ( !$error ) {
@@
-105,7
+100,6
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
"Server: $server, User: $user, Password: " .
substr( $password, 0, 3 ) . "..., error: " . $error . "\n" );
"Server: $server, User: $user, Password: " .
substr( $password, 0, 3 ) . "..., error: " . $error . "\n" );
-
$this->reportConnectionError( $error );
}
$this->reportConnectionError( $error );
}
@@
-123,7
+117,6
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
wfDebug( "Error selecting database $dbName on server {$this->mServer} " .
"from client host " . wfHostname() . "\n" );
wfDebug( "Error selecting database $dbName on server {$this->mServer} " .
"from client host " . wfHostname() . "\n" );
-
$this->reportConnectionError( "Error selecting database $dbName" );
}
}
$this->reportConnectionError( "Error selecting database $dbName" );
}
}
@@
-133,19
+126,25
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
$this->reportConnectionError( "Error setting character set" );
}
$this->reportConnectionError( "Error setting character set" );
}
+ // Abstract over any insane MySQL defaults
+ $set = array( 'group_concat_max_len = 262144' );
// Set SQL mode, default is turning them all off, can be overridden or skipped with null
if ( is_string( $wgSQLMode ) ) {
// Set SQL mode, default is turning them all off, can be overridden or skipped with null
if ( is_string( $wgSQLMode ) ) {
- $mode = $this->addQuotes( $wgSQLMode );
+ $set[] = 'sql_mode = ' . $this->addQuotes( $wgSQLMode );
+ }
+
+ if ( $set ) {
// Use doQuery() to avoid opening implicit transactions (DBO_TRX)
// Use doQuery() to avoid opening implicit transactions (DBO_TRX)
- $success = $this->doQuery(
"SET sql_mode = $mode"
, __METHOD__ );
+ $success = $this->doQuery(
'SET ' . implode( ', ', $set )
, __METHOD__ );
if ( !$success ) {
wfLogDBError(
if ( !$success ) {
wfLogDBError(
-
"Error setting sql_mode to $mode on server {db_server}"
,
+
'Error setting MySQL variables on server {db_server} (check $wgSQLMode)'
,
$this->getLogContext( array(
'method' => __METHOD__,
) )
);
$this->getLogContext( array(
'method' => __METHOD__,
) )
);
- $this->reportConnectionError( "Error setting sql_mode to $mode" );
+ $this->reportConnectionError(
+ 'Error setting MySQL variables on server {db_server} (check $wgSQLMode)' );
}
}
}
}
@@
-701,7
+700,6
@@
abstract class DatabaseMysqlBase extends DatabaseBase {
}
}
}
}
-
return $status;
}
return $status;
}