- Patch #337926 by Damien Tournoud: clean-up lower case handling.

2 files changed, 8 insertions, 9 deletions

diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 82c962929..661503cd6 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -13,11 +13,14 @@
 
 class DatabaseConnection_mysql extends DatabaseConnection {
 
-  protected $transactionSupport = FALSE;
-
   public function __construct(Array $connection_options = array()) {
-    $this->transactionSupport = isset($connection_options['transactions']) ? $connection_options['transactions'] : FALSE;
-    $connection_options['port'] = !empty($connection_options['port']) ? $connection_options['port'] : 3306;
+    // This driver defaults to non transaction support.
+    $this->transactionSupport = !empty($connection_option['transactions']);
+
+    // Default to TCP connection on port 3306.
+    if (empty($connection_options['port'])) {
+      $connection_options['port'] = 3306;
+    }
 
     $dsn = 'mysql:host=' . $connection_options['host'] . ';port=' . $connection_options['port'] . ';dbname=' . $connection_options['database'];
     parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array(
@@ -53,10 +56,6 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     return 'mysql';
   }
 
-  public function supportsTransactions() {
-    return $this->transactionSupport;
-  }
-
   public function mapConditionOperator($operator) {
     // We don't want to override any of the defaults.
     return NULL;
diff --git a/includes/database/mysql/schema.inc b/includes/database/mysql/schema.inc
index 40f45aeb8..bbc9a9ca0 100644
--- a/includes/database/mysql/schema.inc
+++ b/includes/database/mysql/schema.inc
@@ -92,7 +92,7 @@ class DatabaseSchema_mysql extends DatabaseSchema {
       $sql .= ' auto_increment';
     }
 
-    // $spec['default'] can be NULL, so we explicitely check for the key here.
+    // $spec['default'] can be NULL, so we explicitly check for the key here.
     if (array_key_exists('default', $spec)) {
       if (is_string($spec['default'])) {
         $spec['default'] = "'" . $spec['default'] . "'";