3348 magnus.blaudd@stripped 2011-05-25 [merge]
Merge 7.0 -> 5.5-cluster
modified:
storage/ndb/src/common/portlib/CMakeLists.txt
3347 magnus.blaudd@stripped 2011-05-25
ndb
- disable also rpl_ndb_mixed_implicit_commit_binlog due to bug#12586131
modified:
mysql-test/suite/rpl_ndb/t/disabled.def
3346 magnus.blaudd@stripped 2011-05-24 [merge]
Merge 7.0 -> 5.5-cluster
modified:
storage/ndb/src/common/portlib/CMakeLists.txt
storage/ndb/src/common/util/ndbzio.c
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def 2011-05-24 13:05:58 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2011-05-25 06:47:03 +0000
@@ -12,4 +12,5 @@
rpl_ndb_set_null : bug #51100
rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
+rpl_ndb_mixed_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
=== modified file 'storage/ndb/src/common/portlib/CMakeLists.txt'
--- a/storage/ndb/src/common/portlib/CMakeLists.txt 2011-05-24 14:33:47 +0000
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt 2011-05-25 06:52:33 +0000
@@ -40,7 +40,7 @@ TARGET_LINK_LIBRARIES(NdbDir-t ndbportli
ADD_EXECUTABLE(NdbGetInAddr-t NdbTCP.cpp)
SET_TARGET_PROPERTIES(NdbGetInAddr-t
PROPERTIES COMPILE_FLAGS "-DTEST_NDBGETINADDR")
-TARGET_LINK_LIBRARIES(NdbGetInAddr-t ${LIBSOCKET})
+TARGET_LINK_LIBRARIES(NdbGetInAddr-t ${LIBSOCKET} ${LIBNSL})
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (magnus.blaudd:3346 to 3348) | magnus.blaudd | 25 May |
