diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 15:11:37 +0200 |
| commit | f900b6581021d119376660e6a65166cd74de0a5d (patch) | |
| tree | 6e8a3e15bb0980c034b6b2092fee3b9d6bd5d237 /sql | |
| parent | 721a6a6a6d3de10d24396ba96d6b8a013080f843 (diff) | |
| download | mariadb-git-f900b6581021d119376660e6a65166cd74de0a5d.tar.gz | |
Merge of innodb_plugin for MySQL 5.1.53 with xtradb
Fixed compiler warnings in xtradb
Added back resetting of null bitmap but now in row_search_for_mysql()
storage/xtradb/row/row0sel.c:
Added back resetting of null bitmap but now in row_search_for_mysql()
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/rpl_record.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc index 3a46bbcd6ee..ecae1efdce4 100644 --- a/sql/rpl_record.cc +++ b/sql/rpl_record.cc @@ -77,7 +77,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols, unsigned int null_mask= 1U; for ( ; (field= *p_field) ; p_field++) { - DBUG_PRINT("debug", ("null_mask=%d; null_ptr=%p; row_data=%p; null_byte_count=%d", + DBUG_PRINT("debug", ("null_mask: %d null_ptr: %p row_data: %p null_byte_count: %d", null_mask, null_ptr, row_data, null_byte_count)); if (bitmap_is_set(cols, p_field - table->field)) { |