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

[Martin Zaun]

 3102 Martin Zaun	2009-11-07 [merge]
      ndbjtie - merge from ndb-6.3-ndbjtie-automake to ndb-6.3-ndbjtie.

    modified:
      storage/ndb/ndbjtie/utils/helpers.hpp
 3101 Martin Zaun	2009-11-06 [merge]
      ndbjtie - merge from 6.3-ndbjtie-automake to 6.3-ndbjtie.

    added:
      storage/ndb/ndbjtie/src/ndbjtie_defs.hpp
    modified:
      storage/ndb/ndbjtie/jtie/include/jtie_gcalls.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_array_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_enum.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_enum_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_object_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbybb_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_ptrbyval_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbybb_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_refbyval_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_string_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_value.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_value_impl.hpp
      storage/ndb/ndbjtie/jtie/include/jtie_tconv_vwidth.hpp
      storage/ndb/ndbjtie/jtie/test/myjapi/Makefile.am
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapi.hpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_MyJapiCtypes.hpp
      storage/ndb/ndbjtie/jtie/test/myjapi/myjapi_lib.cpp
      storage/ndb/ndbjtie/src/mysql_jtie.hpp
      storage/ndb/ndbjtie/src/ndbapi_jtie.hpp
=== modified file 'storage/ndb/ndbjtie/utils/helpers.hpp'
--- a/storage/ndb/ndbjtie/utils/helpers.hpp	2009-10-31 07:44:53 +0000
+++ b/storage/ndb/ndbjtie/utils/helpers.hpp	2009-11-07 09:20:20 +0000
@@ -41,12 +41,14 @@ using std::flush;
 
 // gcc: crashes when printing source code file number:
 //               << ", line: " << (__LINE__)
-// so, we use C99's __func__ and also convert to string using sprintf()
+// so, we use C99's __func__ and also convert to string using sprintf().
+// Solaris: unfortunately __func__ is not supported by some C++ compilers 
+// so we comment it out but leave the line here for debugging
+//             << ", function: " << (__func__)
 #define ABORT_ERROR(message)                                            \
     do { char l[1024];                                                  \
         sprintf(l, "%d", __LINE__);                                     \
         cout << "!!! error, file: " << (__FILE__)                       \
-             << ", function: " << (__func__)                            \
              << ", line: " << l                                         \
              << ", msg: " << message << "." << endl;             
      \
         exit(-1);                                                       \


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