- merge changelog updates from 0.6

diff --git a/CHANGES b/CHANGES
index 6e884d41ef8b11e23bf7e0a48b6ede5796f50a2b..714d9cb884b9c0070fed7f188bad8e7360337efe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -69,6 +69,12 @@ CHANGES
     str() on values.
     
 - engine
+  - The "unicode warning" against non-unicode bind data
+    is now raised only when the
+    Unicode type is used explictly; not when 
+    convert_unicode=True is used on the engine 
+    or String type.
+    
   - Fixed memory leak in C version of Decimal result
     processor.  [ticket:1978]
     
@@ -115,6 +121,11 @@ CHANGES
     than that of the parent table doesn't render at all,
     as cross-schema references do not appear to be supported.
 
+- mssql
+   - The rewrite of index reflection in [ticket:1770] was
+     unfortunately not tested correctly, and returned incorrect
+     results.   This regression is now fixed.
+
 - oracle
   - The cx_oracle "decimal detection" logic, which takes place
     for for result set columns with ambiguous numeric characteristics,