bzr push into mysql-5.1-telco-6.3-ndbjtie branch (martin.zaun:3145 to 3146)

[Martin Zaun]

 3146 Martin Zaun	2009-11-27
      ndbjtie - jtie unit test fix for gcc 3.4.3 (have gcc-3-compiled jtie working on Linux64).

    modified:
      storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp
 3145 Jorgen Austvik	2009-11-26
      Add MTR test for cluster/J

    added:
      mysql-test/include/have_connectorj.inc
      mysql-test/include/have_junit.inc
      mysql-test/include/run_java.inc
      mysql-test/suite/ndb/include/have_clusterj.inc
      mysql-test/suite/ndb/t/clusterj.test
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/AllTests.java
    modified:
      mysql-test/include/default_ndbd.cnf
      mysql-test/include/run_junit.inc
      mysql-test/suite/ndb/t/ndb_jtie.test
      storage/ndb/clusterj/clusterj-test/Makefile.am
=== modified file 'storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp'
--- a/storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp	2009-11-26 03:00:43 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myapi/myapi_test.cpp	2009-11-27 10:30:02 +0000
@@ -613,17 +613,26 @@ test9()
 }
 
 template< typename E, void (F)(E) >
-static void call(E e) 
+inline void call(E e) 
 {
     (F)(e);
 }
 
 template< typename E, E (F)() >
-static E call() 
+inline E call() 
 {
     return (F)();
 }
 
+#if 0
+// explicit function template instantiations if not declared inline
+// (for gcc 3.4.3)
+template C0::C0E call< C0::C0E, C0::deliver_C0E1 >();
+template const C0::C0E call< const C0::C0E, C0::deliver_C0E1c >();
+template void call< C0::C0E, C0::take_C0E1 >(C0::C0E);
+template void call< const C0::C0E, C0::take_C0E1c >(const C0::C0E);
+#endif
+
 void
 test10()
 {
@@ -648,7 +657,7 @@ test10()
     assert(ec == C0::C0E1);
     
     printf("\ncall< C0::C0E, C0::take_C0E1c >(e)...\n");
-    call< C0::C0E, C0::take_C0E1c >(ec);
+    call< const C0::C0E, C0::take_C0E1c >(ec);
 }
 
 void


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