4047 Magnus Blåudd 2011-01-11 [merge]
Merge 7.0 -> 7.1
modified:
storage/ndb/include/ndb_config.h.in
4046 Craig L Russell 2011-01-10
Allow annotation to specify table name for DynamicObject; change name of method from tableName() to table() in DynamicObject
modified:
storage/ndb/clusterj/clusterj-api/src/main/java/com/mysql/clusterj/DynamicObject.java
storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/DynamicObjectTest.java
storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/LoadTest.java
=== modified file 'storage/ndb/include/ndb_config.h.in'
--- a/storage/ndb/include/ndb_config.h.in 2010-11-18 09:38:59 +0000
+++ b/storage/ndb/include/ndb_config.h.in 2011-01-11 08:39:44 +0000
@@ -35,3 +35,9 @@
#cmakedefine HAVE_ATOMIC_H 1
#cmakedefine HAVE_SUN_PREFETCH_H 1
#cmakedefine NDB_PORT @NDB_PORT@
+#cmakedefine HAVE_MLOCK 1
+#cmakedefine HAVE_FFS 1
+#cmakedefine HAVE___BUILTIN_FFS 1
+#cmakedefine HAVE__BITSCANFORWARD 1
+#cmakedefine HAVE_PTHREAD_MUTEXATTR_INIT 1
+#cmakedefine HAVE_PTHREAD_MUTEXATTR_SETTYPE 1
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4046 to 4047) | Magnus Blåudd | 11 Jan |
