diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-28 13:08:40 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-28 13:08:40 +0200 |
| commit | 89db8ee4c16c5cdd589e51f27fcd3fc23cf41aae (patch) | |
| tree | 0a667b4e332fe5181bba4531d025740bc892821a /application | |
| parent | cbd78d826b965ad6dfc953686594749cbdf21af3 (diff) | |
| parent | d580999cead0aa37d705c2f32e02712a2d522deb (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_subdrivers
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/database.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/database.php b/application/config/database.php index 19498735c..cb6ebad10 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -43,7 +43,7 @@ | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to | ['dbdriver'] The database type. e.g.: mysql. Currently supported: -| cubrid, interbase, mssql, mysql, mysqli, oci8, +| cubrid, interbase, mssql, mysql, mysqli, oci8, | odbc, pdo, postgre, sqlite, sqlite3, sqlsrv | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Query Builder class @@ -84,7 +84,7 @@ $db['default'] = array( 'database' => '', 'dbdriver' => 'mysqli', 'dbprefix' => '', - 'pconnect' => FALSE, + 'pconnect' => TRUE, 'db_debug' => TRUE, 'cache_on' => FALSE, 'cachedir' => '', |