From 0e98bed90376f6378648daaafce0a447dbe038f7 Mon Sep 17 00:00:00 2001
From: "dfischer/mysqldev@mysql.com/production.mysql.com" <>
Date: Tue, 17 Jul 2007 10:25:48 +0200
Subject: [PATCH 1/3] make_binary_distribution.sh:   BUG#29382

---
 scripts/make_binary_distribution.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 77f51c51c19..eee5ed99fa5 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -295,6 +295,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
     mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
+    mysql-test/std_data/Index.xml \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
     mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
     $BASE/mysql-test/std_data

From 4bab858fba5e6679fe8ec4209aa6b59be87fd824 Mon Sep 17 00:00:00 2001
From: "dfischer/mysqldev@mysql.com/production.mysql.com" <>
Date: Thu, 19 Jul 2007 14:12:05 +0200
Subject: [PATCH 2/3] field.cc, field.h:   i5 compatibility

---
 sql/field.cc | 1 +
 sql/field.h  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/field.cc b/sql/field.cc
index 2e227f0e67e..58832db04cd 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6270,6 +6270,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
   is 2.
 ****************************************************************************/
 
+const uint Field_varstring::MAX_SIZE= UINT_MAX16;
 
 int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
 {
diff --git a/sql/field.h b/sql/field.h
index fb6534b7b55..fbf402ab5c3 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1116,7 +1116,7 @@ public:
     The maximum space available in a Field_varstring, in bytes. See
     length_bytes.
   */
-  static const uint MAX_SIZE= UINT_MAX16;
+  static const uint MAX_SIZE;
   /* Store number of bytes used to store length (1 or 2) */
   uint32 length_bytes;
   Field_varstring(char *ptr_arg,

From cccecb833bc361cb0b1907503025d76be260f10c Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Thu, 19 Jul 2007 23:06:34 +0200
Subject: [PATCH 3/3] BUG#20815 Errno 12 on Windows after 197 connections

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2a828c1843..cdd0cde8b8d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,6 +123,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 	# generate map files
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
 
+  # set stack size (see bug#20815)
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
+
 	# remove support for Exception handling
 	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})