Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  alf.(none):/src/mysql-5.1-build_31929


sql/CMakeLists.txt:
  Auto merged
storage/myisam/CMakeLists.txt:
  Auto merged

extra/yassl/CMakeLists.txt

@@ -24,4 +24,5 @@ SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp sr
 				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)

sql/CMakeLists.txt

@@ -168,5 +168,5 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
                          "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)

storage/archive/CMakeLists.txt

@@ -25,4 +25,5 @@ SET(ARCHIVE_SOURCES  azio.c ha_archive.cc ha_archive.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(archive ${ARCHIVE_SOURCES})
+  ADD_DEPENDENCIES(archive GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/blackhole/CMakeLists.txt

@@ -24,4 +24,5 @@ SET(BLACKHOLE_SOURCES  ha_blackhole.cc ha_blackhole.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(blackhole ${BLACKHOLE_SOURCES})
+  ADD_DEPENDENCIES(blackhole GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/csv/CMakeLists.txt

@@ -24,4 +24,5 @@ SET(CSV_SOURCES  ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(csv ${CSV_SOURCES})
+  ADD_DEPENDENCIES(csv GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/example/CMakeLists.txt

@@ -24,4 +24,5 @@ SET(EXAMPLE_SOURCES ha_example.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(example ${EXAMPLE_SOURCES})
+  ADD_DEPENDENCIES(example GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/federated/CMakeLists.txt

@@ -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)

storage/heap/CMakeLists.txt

@@ -29,4 +29,5 @@ SET(HEAP_SOURCES  _check.c _rectest.c hp_block.c hp_clear.c hp_close.c hp_create
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(heap ${HEAP_SOURCES})
+  ADD_DEPENDENCIES(heap GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/innobase/CMakeLists.txt

@@ -58,4 +58,5 @@ SET(INNOBASE_SOURCES  btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(innobase ${INNOBASE_SOURCES})
+  ADD_DEPENDENCIES(innobase GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

storage/myisam/CMakeLists.txt

@@ -37,6 +37,7 @@ SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.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)

storage/myisammrg/CMakeLists.txt

@@ -30,4 +30,5 @@ SET(MYISAMMRG_SOURCES  myrg_close.c myrg_create.c myrg_delete.c myrg_extra.c myr
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(myisammrg ${MYISAMMRG_SOURCES})
+  ADD_DEPENDENCIES(myisammrg GenError)
 ENDIF(NOT SOURCE_SUBLIBS)

vio/CMakeLists.txt

@@ -23,5 +23,6 @@ SET(VIO_SOURCES  vio.c viosocket.c viossl.c viosslfactories.c)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(vio ${VIO_SOURCES})
+  ADD_DEPENDENCIES(vio GenError)
 ENDIF(NOT SOURCE_SUBLIBS)