diff options
| -rw-r--r-- | includes/database/mysql/database.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/database_test.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc index b7043dd15..b5a2e4eaa 100644 --- a/includes/database/mysql/database.inc +++ b/includes/database/mysql/database.inc @@ -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()) { diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 15802ed1b..c98c5be69 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -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.')); } } |