Merge trift2.:/MySQL/M51/bug29982-5.1

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fc201a06:
  Auto merged
CMakeLists.txt:
  Auto merged
tests/CMakeLists.txt:
  Auto merged

19 files changed, 0 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dc62977846..6395ae17a14 100644..100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,9 +136,6 @@ 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})
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8a670cf4c4b..8a670cf4c4b 100644..100755
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt
index 375fd19fb40..375fd19fb40 100644..100755
--- a/dbug/CMakeLists.txt
+++ b/dbug/CMakeLists.txt
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 1722c9da5f2..1722c9da5f2 100644..100755
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index 5cc97f22a36..5cc97f22a36 100644..100755
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
index baa8f97dff6..baa8f97dff6 100644..100755
--- a/extra/yassl/taocrypt/CMakeLists.txt
+++ b/extra/yassl/taocrypt/CMakeLists.txt
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 7d4dcc1e919..7d4dcc1e919 100644..100755
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 1ae625c4c03..1ae625c4c03 100644..100755
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt
index 9b95c9d2bc6..9b95c9d2bc6 100644..100755
--- a/regex/CMakeLists.txt
+++ b/regex/CMakeLists.txt
diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt
index f8a8a7e57d0..f8a8a7e57d0 100644..100755
--- a/server-tools/instance-manager/CMakeLists.txt
+++ b/server-tools/instance-manager/CMakeLists.txt
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index c792e10c3af..c792e10c3af 100644..100755
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
index f4732397cc4..f4732397cc4 100644..100755
--- a/storage/heap/CMakeLists.txt
+++ b/storage/heap/CMakeLists.txt
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index d2b6162ba26..d2b6162ba26 100644..100755
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index ec7cde9a789..ec7cde9a789 100644..100755
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt
index b35638ac91d..b35638ac91d 100644..100755
--- a/storage/myisammrg/CMakeLists.txt
+++ b/storage/myisammrg/CMakeLists.txt
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index ac7c75ec56c..ac7c75ec56c 100644..100755
--- a/strings/CMakeLists.txt
+++ b/strings/CMakeLists.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7559ca9ec6b..7559ca9ec6b 100644..100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index e4940d54da8..e4940d54da8 100644..100755
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index ac315b0dd85..ac315b0dd85 100644..100755
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt