Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 10ef00c..c63bb9f 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -68,6 +68,9 @@
{
$this->_like_escape_str = '';
$this->_like_escape_chr = '';
+
+ //Set the charset with the connection string
+ $this->hostname .= ";charset=" . $this->char_set;
}
else if (strpos($this->hostname, 'odbc') !== FALSE)
{
@@ -81,6 +84,7 @@
}
$this->hostname = $this->hostname . ";dbname=".$this->database;
+
$this->trans_enabled = FALSE;
$this->_random_keyword = ' RND('.time().')'; // database specific random keyword