bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3329 to 3330)

[Tor Didriksen]

 3330 Tor Didriksen	2010-07-30
      Post push fix: 'gmake -j 4' revealed a lacking dependency on GenError.

    modified:
      sql/CMakeLists.txt
 3329 Tor Didriksen	2010-07-30
      Bug #54805 definitions in regex/my_regex.h conflict with /usr/include/regex.h
      
      Pos-push fix: header guard in my_regex.h conflicts with /usr/include/regex.h
      
      Also: Implement mock functions for new interactions between MDL and THD.
      Also: Don't gunit tests with sql library, link with a minimal library instead.
     @ regex/my_regex.h
        Fix include guard.
     @ sql/CMakeLists.txt
        New, minimal, library for gunit tests.
     @ unittest/gunit/CMakeLists.txt
        Do not link with sql library.
     @ unittest/gunit/mdl-t.cc
        New mock functions for MDL/THD interaction.
     @ unittest/gunit/mdl_mytap-t.cc
        New mock functions for MDL/THD interaction.

    modified:
      regex/my_regex.h
      sql/CMakeLists.txt
      unittest/gunit/CMakeLists.txt
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-30 08:34:23 +0000
+++ b/sql/CMakeLists.txt	2010-07-30 09:39:00 +0000
@@ -104,6 +104,7 @@ SET (SLAVE_SOURCE rpl_slave.cc rpl_repor
 ADD_LIBRARY(slave ${SLAVE_SOURCE})
 ADD_DEPENDENCIES(slave GenError)
 ADD_LIBRARY(sqlgunitlib mdl.cc sql_list.cc sql_string.cc thr_malloc.cc)
+ADD_DEPENDENCIES(sqlgunitlib GenError)
 
 
 IF(WIN32)


Attachment: [text/bzr-bundle] bzr/[e-mail]