diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-02-27 22:56:39 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-02-27 22:56:39 +0100 |
| commit | 2d87f8458f30057af466cd4b3b5edcf568861691 (patch) | |
| tree | 37b21f5b14119445a4cf1b3fd338e48f82ac0cdf /system/database/drivers/mysql/mysql_driver.php | |
| parent | 03f8ec00afb0da44c2191c4248832a37f7bd3c1f (diff) | |
| parent | d8a0aed00b2174af5cac96ecada10ea392e19120 (diff) | |
Merge upstream
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 067710ff0..c88a8a766 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -119,11 +119,23 @@ class CI_DB_mysql_driver extends CI_DB { /** * Select the database * + * @param string database name * @return bool */ - public function db_select() + public function db_select($database = '') { - return @mysql_select_db($this->database, $this->conn_id); + if ($database === '') + { + $database = $this->database; + } + + if (@mysql_select_db($database, $this->conn_id)) + { + $this->database = $database; + return TRUE; + } + + return FALSE; } // -------------------------------------------------------------------- |