diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-07 10:41:19 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-07 10:41:19 -0800 |
| commit | c711bf1b1fcf7840467a7a044b1f511e7b69c139 (patch) | |
| tree | ee84a16b5ce4448fd41ba7ffa2cb2381b225e206 /system/libraries/Database_Mysqli.php | |
| parent | 31454d37b3ea02104925f1976609576c5f09c0c6 (diff) | |
| parent | 10c05c855a1634a60048a52e8d90bc51f187ede7 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'system/libraries/Database_Mysqli.php')
| -rw-r--r-- | system/libraries/Database_Mysqli.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/system/libraries/Database_Mysqli.php b/system/libraries/Database_Mysqli.php index 08ed99df..41b635d1 100644 --- a/system/libraries/Database_Mysqli.php +++ b/system/libraries/Database_Mysqli.php @@ -1,9 +1,7 @@ <?php defined('SYSPATH') or die('No direct script access.'); /** * MySQL database connection. - * - * $Id: Database_Mysqli.php 4712 2009-12-10 21:47:09Z cbandy $ - * + * * @package Kohana * @author Kohana Team * @copyright (c) 2008-2009 Kohana Team @@ -30,13 +28,13 @@ class Database_Mysqli_Core extends Database_Mysql { $host = isset($host) ? $host : $socket; $mysqli = mysqli_init(); - + if ( ! $mysqli->real_connect($host, $user, $pass, $database, $port, $socket, $params)) throw new Database_Exception('#:errno: :error', array(':error' => $mysqli->connect_error, ':errno' => $mysqli->connect_errno)); - + $this->connection = $mysqli; - + if (isset($this->config['character_set'])) { // Set the character set |