bzr push into mysql-5.1-telco-7.1 branch (jdd:3488 to 3489)

[John David Duncan]

 3489 John David Duncan	2010-03-08 [merge]
      Merge

    modified:
      storage/ndb/ndb_configure.m4
 3488 Magnus Blåudd	2010-03-08 [merge]
      Merge 7.0 -> 7.1

    modified:
      mysql-test/suite/ndb_team/r/ndb_backup_print.result
      mysql-test/suite/ndb_team/t/ndb_backup_print.test
      storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
      storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
      storage/ndb/ndbapi-examples/ndbapi_blob/ndbapi_blob.cpp
      storage/ndb/ndbapi-examples/ndbapi_blob_ndbrecord/main.cpp
      storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
      storage/ndb/ndbapi-examples/ndbapi_recattr_vs_record/main.cpp
      storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
      storage/ndb/ndbapi-examples/ndbapi_s_i_ndbrecord/main.cpp
      storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
      storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
      storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
      storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2010-02-21 07:30:16 +0000
+++ b/storage/ndb/ndb_configure.m4	2010-03-08 18:21:17 +0000
@@ -307,7 +307,7 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   have_clusterj=no
   if test X"$ndb_java_supported" = Xyes
   then
-    if [[[ $CHARSETS =~ "ucs2" ]]]
+    if echo $CHARSETS | grep -q ucs2
     then
       AC_MSG_RESULT([-- including Cluster/J])
       have_clusterj=yes

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