mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-19 11:19:56 +09:00
merge branche 1.5.0 to trunk (~r10525)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10534 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
361cd64c16
commit
c9047de30d
15 changed files with 643 additions and 195 deletions
|
|
@ -82,6 +82,8 @@
|
|||
|
||||
var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
|
||||
|
||||
var $use_prepared_statements; ///< flag to decide if class prepared statements or not (when supported); can be changed from db.config.info
|
||||
|
||||
/**
|
||||
* @brief returns instance of certain db type
|
||||
* @param[in] $db_type type of db
|
||||
|
|
@ -762,6 +764,7 @@
|
|||
else
|
||||
$this->slave_db = $db_info->slave_db;
|
||||
$this->prefix = $db_info->master_db["db_table_prefix"];
|
||||
$this->use_prepared_statements = $db_info->use_prepared_statements;
|
||||
}
|
||||
|
||||
function __connect(){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue