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
f02aa93
..
7b903d6
100644
(file)
--- a/
includes/db/DatabaseMysqlBase.php
+++ b/
includes/db/DatabaseMysqlBase.php
@@
-126,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)' );
}
}
}
}