diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-06 12:52:11 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-06 12:52:11 +0100 |
| commit | 7335532a50ba994744d4cae074824fa24dd06ef9 (patch) | |
| tree | d7c48faf2eb9c9ec789aa3f77cb58a87c7318ddc /sql/ha_ndbcluster_binlog.cc | |
| parent | 8d5a63f0ac8afe7e63608a2384c91e1446144e9b (diff) | |
| parent | 66fa5cb968feb2ee2518bbaf7f163d1097545098 (diff) | |
| download | mariadb-git-7335532a50ba994744d4cae074824fa24dd06ef9.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/bug19911/my51-bug19911
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
sql/ha_ndbcluster_binlog.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 841dce2d832..6dae841157c 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -1002,7 +1002,7 @@ static void ndbcluster_get_schema(NDB_SHARE *share, 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); } |