- Patch #344575 by cdale: made the ANSI compatibility mode less strict to work around a MySQL 5 bug.

merge-requests/26/head
Dries Buytaert 2008-12-24 10:21:32 +00:00
parent 821ad24bc1
commit 779a70a0d4
2 changed files with 2 additions and 2 deletions

View File

@ -40,7 +40,7 @@ class DatabaseConnection_mysql extends DatabaseConnection {
// 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 disscussion.
$this->exec("SET sql_mode='ANSI,TRADITIONAL,ONLY_FULL_GROUP_BY'");
$this->exec("SET sql_mode='ANSI,TRADITIONAL'");
}
public function queryRange($query, array $args, $from, $count, array $options = array()) {

View File

@ -2019,7 +2019,7 @@ class DatabaseInvalidDataTestCase extends DatabaseTestCase {
->fields('test', array('name', 'age'))
->condition('age', array(17, 75),'IN')
->execute()->fetchObject();
$this->assertFalse($record, $e->getMessage() .':: '. t('Insert aborted as expected.'));
$this->assertFalse($record, t('Insert aborted as expected.'));
}
}