Fix of Bug#60307 + change log entries.

лаврин · лаврин · commit 8dbb2a3a6644 · 2012-05-24T15:52:27.000+03:00
+ added to .bzrignore vs10 project files name templates
diff --git a/.bzrignore b/.bzrignore
@@ -2,6 +2,8 @@
 *.la
 *.spec
 *.vcproj
+*.vcxproj
+*.vcxproj.*
 *.sln
 *.ncb
 *.suo
diff --git a/CHANGES b/CHANGES
@@ -22,7 +22,7 @@
   51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-GA  1.1.1 - 2010-xx-xx
+GA  1.1.1 - 2012-0x-xx
 
 - DatabaseMetaData::getSQLKeywords() updated to match MySQL 5.5. Note
   that C/C++, just like C/JDBC, returns the same list for every
@@ -33,6 +33,17 @@ GA  1.1.1 - 2010-xx-xx
 
 - Added new method ResultSetMetaData::isNumeric() and implemented it in
   all classes that subclass from it. (Andrey)
+  
+- Fixed the bug causing compilation errors in Microsoft Visual Studio 2010 if
+  stdint.h was included. See http://bugs.mysql.com/bug.php?id=60307
+
+- Fixed bug making statement that did not raise any warning to return
+  warnings from previously executed statement.
+
+- Fixed stores(Lower|Mixed)Case(Quoted)Identifiers methods. 
+
+- Built against libmysql 5.5.24 enabling support of authentification plugins
+  and IPv6.
 
 GA  1.1.0 - 2010-09-13
 
diff --git a/cppconn/config.h.cm b/cppconn/config.h.cm
@@ -69,6 +69,12 @@
 #if defined(_WIN32)
 #ifndef CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES
 
+#if _MSC_VER >= 1600
+
+#include <stdint.h>
+
+#else
+
 #if !defined(HAVE_INT8_T) && defined(HAVE_MS_INT8)
 typedef __int8			int8_t;
 #endif
@@ -99,5 +105,6 @@ typedef __int64			int64_t;
 typedef unsigned __int64	uint64_t;
 #endif
 
+#endif  // _MSC_VER >= 1600
 #endif	// CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES
 #endif	//	_WIN32
