diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:27:38 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-06 20:27:38 +0200 |
| commit | 8e160e471259ad01c0e994e7ce5797c2a51afd7a (patch) | |
| tree | 10837b94a0e587499a6864c0c454b98bd26ec127 | |
| parent | d65c3b5d057f4bc48e25cf3f968ceec844ebd155 (diff) | |
Fix changelog
| -rw-r--r-- | user_guide_src/source/changelog.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 665eba2a8..db3a57a4b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -80,9 +80,6 @@ Release Date: Not Released - db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1). - Added DSN string support for CUBRID. - Added persistent connections support for CUBRID. -<<<<<<< HEAD - - CUBRID driver's utility class now overrides list_databases() in order to use cubrid_list_dbs(). -======= - Added random ordering support for MSSQL. - Added random ordering support for SQLSRV. - Added support for SQLite3 database driver. @@ -95,7 +92,7 @@ Release Date: Not Released - num_rows() is now only called explicitly by the developer and no longer re-executes statements. - Added replace() support for SQLite. - Renamed internal method _escape_identifiers() to escape_identifiers(). ->>>>>>> ea09a8a5552f2aacdeab0c88a605fe44047ebd0a + - CUBRID driver's utility class now overrides list_databases() in order to use cubrid_list_dbs(). - Libraries |