diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-03-01 18:34:09 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-03-01 18:34:09 +0100 |
| commit | eabc5ec81209ec83393222f2964098aedf6dbc7a (patch) | |
| tree | 1834fa8ca7b788d27cf0e916f9578d8bb8f1f999 /system/database/drivers/cubrid | |
| parent | a0da0b28bdb0ff73d5c0d9f8780ab0f6d74f39e3 (diff) | |
| parent | e3a68042c086acfc98ae273adbd8527af0c6ab8b (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/database/drivers/cubrid')
| -rw-r--r-- | system/database/drivers/cubrid/cubrid_driver.php | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php index cde719eae..42f08fbf6 100644 --- a/system/database/drivers/cubrid/cubrid_driver.php +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -156,24 +156,6 @@ class CI_DB_cubrid_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Set client character set - * - * @access public - * @param string - * @param string - * @return resource - */ - function db_set_charset($charset, $collation) - { - // In CUBRID, there is no need to set charset or collation. - // This is why returning true will allow the application continue - // its normal process. - return TRUE; - } - - // -------------------------------------------------------------------- - - /** * Version number query string * * @access public @@ -362,12 +344,11 @@ class CI_DB_cubrid_driver extends CI_DB { /** * Affected Rows * - * @access public - * @return integer + * @return int */ - function affected_rows() + public function affected_rows() { - return @cubrid_affected_rows($this->conn_id); + return @cubrid_affected_rows(); } // -------------------------------------------------------------------- @@ -801,4 +782,4 @@ class CI_DB_cubrid_driver extends CI_DB { /* End of file cubrid_driver.php */ -/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */
\ No newline at end of file +/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */ |