bzr push into mysql-5.1-telco-6.3-ndbjtie branch (jdd:3102 to 3103)

[John David Duncan]

 3103 John David Duncan	2009-11-07
      Changing 'const unsigned char *' back to 'const char *'
      signed causes a warning on some compilers, but unsigned causes an error on others.

    modified:
      storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp
 3102 John David Duncan	2009-11-07 [merge]
      Merge changes from Martin

    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
      storage/ndb/ndbjtie/utils/helpers.hpp
=== modified file 'storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp'
--- a/storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp	2009-11-05 06:19:14 +0000
+++ b/storage/ndb/ndbjtie/mysql/test/mysql_utils_test.cpp	2009-11-07 17:15:59 +0000
@@ -105,9 +105,9 @@ int main()
        but in the UTF-8 representation it is 0xC3 0xBC.
     */
     
-    const unsigned char my_word_latin1[6]    = { 0xFC, 'l', 'k', 'e', 'r', 0}; 
-    const unsigned char my_word_utf8[7]      = { 0xC3, 0xBC, 'l', 'k', 'e', 'r', 0}; 
-    const unsigned char my_word_truncated[5] = { 0xC3, 0xBC, 'l', 'k', 0};
+    const char my_word_latin1[6]    = { 0xFC, 'l', 'k', 'e', 'r', 0}; 
+    const char my_word_utf8[7]      = { 0xC3, 0xBC, 'l', 'k', 'e', 'r', 0}; 
+    const char my_word_truncated[5] = { 0xC3, 0xBC, 'l', 'k', 0};
     const unsigned char my_bad_utf8[5]       = { 'l' , 0xBC, 'a', 'd', 0};
     char result_buff_1[32];
     char result_buff_2[32];


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