bk commit into 5.1 tree (msvensson:1.2521) BUG#19911

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-06 11:44:07+01:00, msvensson@stripped +1 -0
  Bug#19911 ndb does not work on sol10 x86

  sql/ha_ndbcluster_binlog.cc@stripped, 2008-02-06 11:44:05+01:00, msvensson@stripped
+1 -1
    Change 'assert' to 'DBUG_ASSERT' to avoid that the assert is triggered in the
optimized version
    on solaris 10 for x86

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-12-15 20:23:55 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2008-02-06 11:44:05 +01:00
@@ -1002,7 +1002,7 @@ static void ndbcluster_get_schema(NDB_SH
     uint blob_len= field_blob->get_length((*field)->ptr);
     uchar *blob_ptr= 0;
     field_blob->get_ptr(&blob_ptr);
-    assert(blob_len == 0 || blob_ptr != 0);
+    DBUG_ASSERT(blob_len == 0 || blob_ptr != 0);
     s->query_length= blob_len;
     s->query= sql_strmake((char*) blob_ptr, blob_len);
   }