diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
| commit | 13077951b63cf9858dc14ec9cab7f2b53ec88a3e (patch) | |
| tree | e1fc50ddb8c0a4103c945f15d674d85c6655231b /application/config/database.php | |
| parent | 9128231452f3ccea857a848b61bd0e6e9e319737 (diff) | |
| parent | b66664b5decd68de50ae6c239c8d995d6c088d94 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'application/config/database.php')
| -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' => '', |