diff options
Diffstat (limited to 'includes/database/mysql/database.inc')
| -rw-r--r-- | includes/database/mysql/database.inc | 15 |
1 files changed, 7 insertions, 8 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; |