bk commit into 5.1 tree (iggy:1.2622) BUG#31929

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-14 19:38:23-05:00, iggy@alf.(none) +9 -0
  Bug#31929 Windows build fails with >=4 Parallel build threads.
  - Add GenError Dependency to storage engines that include mysqld_error.h

  extra/yassl/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +2 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  sql/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -1
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/archive/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/blackhole/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/csv/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/federated/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/heap/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  storage/myisam/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +1 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

  vio/CMakeLists.txt@stripped, 2007-11-14 19:38:15-05:00, iggy@alf.(none) +2 -0
    Bug#31929 Windows build fails with >=4 Parallel build threads.
    - Add GenError Dependency.

diff -Nrup a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
--- a/extra/yassl/CMakeLists.txt	2007-08-03 16:51:25 -04:00
+++ b/extra/yassl/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -24,4 +24,6 @@ SET(YASSL_SOURCES  src/buffer.cpp src/ce
 				src/yassl_imp.cpp src/yassl_int.cpp)
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(yassl ${YASSL_SOURCES})
+  ADD_DEPENDENCIES(yassl GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
+
diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-11-14 10:11:41 -05:00
+++ b/sql/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -167,5 +167,5 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDI
                          "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
-ADD_DEPENDENCIES(udf_example strings)
+ADD_DEPENDENCIES(udf_example strings GenError)
 TARGET_LINK_LIBRARIES(udf_example strings wsock32)
diff -Nrup a/storage/archive/CMakeLists.txt b/storage/archive/CMakeLists.txt
--- a/storage/archive/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/archive/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -25,4 +25,5 @@ SET(ARCHIVE_SOURCES  azio.c ha_archive.c
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(archive ${ARCHIVE_SOURCES})
+  ADD_DEPENDENCIES(archive GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/storage/blackhole/CMakeLists.txt b/storage/blackhole/CMakeLists.txt
--- a/storage/blackhole/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/blackhole/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -24,4 +24,5 @@ SET(BLACKHOLE_SOURCES  ha_blackhole.cc h
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(blackhole ${BLACKHOLE_SOURCES})
+  ADD_DEPENDENCIES(blackhole GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/storage/csv/CMakeLists.txt b/storage/csv/CMakeLists.txt
--- a/storage/csv/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/csv/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -24,4 +24,5 @@ SET(CSV_SOURCES  ha_tina.cc ha_tina.h tr
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(csv ${CSV_SOURCES})
+  ADD_DEPENDENCIES(csv GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/storage/federated/CMakeLists.txt b/storage/federated/CMakeLists.txt
--- a/storage/federated/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/federated/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -24,4 +24,5 @@ SET(FEDERATED_SOURCES  ha_federated.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(federated ${FEDERATED_SOURCES})
+  ADD_DEPENDENCIES(federated GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt
--- a/storage/heap/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/heap/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -29,4 +29,5 @@ SET(HEAP_SOURCES  _check.c _rectest.c hp
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(heap ${HEAP_SOURCES})
+  ADD_DEPENDENCIES(heap GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
--- a/storage/myisam/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/storage/myisam/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -37,6 +37,7 @@ SET(MYISAM_SOURCES  ft_boolean_search.c 
 IF(NOT SOURCE_SUBLIBS)
 
   ADD_LIBRARY(myisam ${MYISAM_SOURCES})
+  ADD_DEPENDENCIES(myisam GenError)
 
   ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
   TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32)
diff -Nrup a/vio/CMakeLists.txt b/vio/CMakeLists.txt
--- a/vio/CMakeLists.txt	2007-08-06 17:14:47 -04:00
+++ b/vio/CMakeLists.txt	2007-11-14 19:38:15 -05:00
@@ -23,5 +23,7 @@ SET(VIO_SOURCES  vio.c viosocket.c vioss
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(vio ${VIO_SOURCES})
+  ADD_DEPENDENCIES(vio GenError)
 ENDIF(NOT SOURCE_SUBLIBS)
+