summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-09-05 11:57:30 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-09-05 11:57:30 -0700
commit2c25c781ee646c738e051e26886ffef518031ed0 (patch)
treec9c74a1793fd18a1d5eee2e75619ccb86e91312e /includes
parent53e211196671986cb4bf79b57f975bf119bd271a (diff)
downloadbrdo-2c25c781ee646c738e051e26886ffef518031ed0.tar.gz
brdo-2c25c781ee646c738e051e26886ffef518031ed0.tar.bz2
Issue #1136854 by chx: Fixed MySQL 5.5 breaks speedy testing.
Diffstat (limited to 'includes')
-rw-r--r--includes/database/mysql/database.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 0d9158789..7d5d85998 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -60,8 +60,10 @@ class DatabaseConnection_mysql extends DatabaseConnection {
// This allows Drupal to run almost seamlessly on many different
// kinds of database systems. These settings force MySQL to behave
// the same as postgresql, or sqlite in regards to syntax interpretation
- // and invalid data handling. See http://drupal.org/node/344575 for further discussion.
- $this->exec("SET sql_mode='ANSI,TRADITIONAL'");
+ // and invalid data handling. See http://drupal.org/node/344575 for
+ // further discussion. Also, as MySQL 5.5 changed the meaning of
+ // TRADITIONAL we need to spell out the modes one by one.
+ $this->exec("SET sql_mode='ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER'");
}
public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {