Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22

3 files changed, 60 insertions, 57 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index b2152fbb906..21267f4901a 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -411,7 +411,7 @@ Ndb *ha_ndbcluster::get_ndb()
 
 void ha_ndbcluster::set_rec_per_key()
 {
-  DBUG_ENTER("ha_ndbcluster::get_status_const");
+  DBUG_ENTER("ha_ndbcluster::set_rec_per_key");
   for (uint i=0 ; i < table_share->keys ; i++)
   {
     table->key_info[i].rec_per_key[table->key_info[i].key_parts-1]= 1;
@@ -558,7 +558,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
   THD *thd= current_thd;
   int res;
   NdbError err= trans->getNdbError();
-  DBUG_ENTER("ndb_err");
+  DBUG_ENTER("ha_ndbcluster::ndb_err");
   
   set_ndb_err(thd, err);
 
@@ -695,7 +695,7 @@ static bool field_type_forces_var_part(enum_field_types type)
 bool ha_ndbcluster::set_hidden_key(NdbOperation *ndb_op,
                                    uint fieldnr, const uchar *field_ptr)
 {
-  DBUG_ENTER("set_hidden_key");
+  DBUG_ENTER("ha_ndbcluster::set_hidden_key");
   DBUG_RETURN(ndb_op->equal(fieldnr, (char*)field_ptr) != 0);
 }
 
@@ -708,7 +708,7 @@ int ha_ndbcluster::set_ndb_key(NdbOperation *ndb_op, Field *field,
                                uint fieldnr, const uchar *field_ptr)
 {
   uint32 pack_len= field->pack_length();
-  DBUG_ENTER("set_ndb_key");
+  DBUG_ENTER("ha_ndbcluster::set_ndb_key");
   DBUG_PRINT("enter", ("%d: %s, ndb_type: %u, len=%d", 
                        fieldnr, field->field_name, field->type(),
                        pack_len));
@@ -731,7 +731,7 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field,
 {
   const uchar* field_ptr= field->ptr + row_offset;
   uint32 pack_len= field->pack_length();
-  DBUG_ENTER("set_ndb_value");
+  DBUG_ENTER("ha_ndbcluster::set_ndb_value");
   DBUG_PRINT("enter", ("%d: %s  type: %u  len=%d  is_null=%s", 
                        fieldnr, field->field_name, field->type(), 
                        pack_len, field->is_null(row_offset) ? "Y" : "N"));
@@ -934,7 +934,7 @@ int get_ndb_blobs_value(TABLE* table, NdbValue* value_array,
 int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field,
                                  uint fieldnr, uchar* buf)
 {
-  DBUG_ENTER("get_ndb_value");
+  DBUG_ENTER("ha_ndbcluster::get_ndb_value");
   DBUG_PRINT("enter", ("fieldnr: %d flags: %o", fieldnr,
                        (int)(field != NULL ? field->flags : 0)));
 
@@ -985,7 +985,7 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field,
 */
 int ha_ndbcluster::get_ndb_partition_id(NdbOperation *ndb_op)
 {
-  DBUG_ENTER("get_ndb_partition_id");
+  DBUG_ENTER("ha_ndbcluster::get_ndb_partition_id");
   DBUG_RETURN(ndb_op->getValue(NdbDictionary::Column::FRAGMENT, 
                                (char *)&m_part_id) == NULL);
 }
@@ -1044,7 +1044,7 @@ int ha_ndbcluster::get_metadata(const char *path)
   NDBDICT *dict= ndb->getDictionary();
   const NDBTAB *tab;
   int error;
-  DBUG_ENTER("get_metadata");
+  DBUG_ENTER("ha_ndbcluster::get_metadata");
   DBUG_PRINT("enter", ("m_tabname: %s, path: %s", m_tabname, path));
 
   DBUG_ASSERT(m_table == NULL);
@@ -1463,7 +1463,7 @@ void ha_ndbcluster::release_metadata(THD *thd, Ndb *ndb)
 {
   uint i;
 
-  DBUG_ENTER("release_metadata");
+  DBUG_ENTER("ha_ndbcluster::release_metadata");
   DBUG_PRINT("enter", ("m_tabname: %s", m_tabname));
 
   NDBDICT *dict= ndb->getDictionary();
@@ -1604,7 +1604,7 @@ int ha_ndbcluster::set_primary_key(NdbOperation *op, const uchar *key)
   KEY* key_info= table->key_info + table_share->primary_key;
   KEY_PART_INFO* key_part= key_info->key_part;
   KEY_PART_INFO* end= key_part+key_info->key_parts;
-  DBUG_ENTER("set_primary_key");
+  DBUG_ENTER("ha_ndbcluster::set_primary_key");
 
   for (; key_part != end; key_part++) 
   {
@@ -1626,7 +1626,7 @@ int ha_ndbcluster::set_primary_key_from_record(NdbOperation *op, const uchar *re
   KEY* key_info= table->key_info + table_share->primary_key;
   KEY_PART_INFO* key_part= key_info->key_part;
   KEY_PART_INFO* end= key_part+key_info->key_parts;
-  DBUG_ENTER("set_primary_key_from_record");
+  DBUG_ENTER("ha_ndbcluster::set_primary_key_from_record");
 
   for (; key_part != end; key_part++) 
   {
@@ -1645,7 +1645,7 @@ int ha_ndbcluster::set_index_key_from_record(NdbOperation *op,
   KEY_PART_INFO* key_part= key_info->key_part;
   KEY_PART_INFO* end= key_part+key_info->key_parts;
   uint i;
-  DBUG_ENTER("set_index_key_from_record");
+  DBUG_ENTER("ha_ndbcluster::set_index_key_from_record");
                                                                                 
   for (i= 0; key_part != end; key_part++, i++)
   {
@@ -1684,7 +1684,7 @@ inline
 int ha_ndbcluster::define_read_attrs(uchar* buf, NdbOperation* op)
 {
   uint i;
-  DBUG_ENTER("define_read_attrs");  
+  DBUG_ENTER("ha_ndbcluster::define_read_attrs");  
 
   // Define attributes to read
   for (i= 0; i < table_share->fields; i++) 
@@ -1731,7 +1731,7 @@ int ha_ndbcluster::pk_read(const uchar *key, uint key_len, uchar *buf,
   NdbOperation *op;
 
   int res;
-  DBUG_ENTER("pk_read");
+  DBUG_ENTER("ha_ndbcluster::pk_read");
   DBUG_PRINT("enter", ("key_len: %u", key_len));
   DBUG_DUMP("key", key, key_len);
   m_write_op= FALSE;
@@ -1798,7 +1798,7 @@ int ha_ndbcluster::complemented_read(const uchar *old_data, uchar *new_data,
   uint no_fields= table_share->fields, i;
   NdbTransaction *trans= m_active_trans;
   NdbOperation *op;
-  DBUG_ENTER("complemented_read");
+  DBUG_ENTER("ha_ndbcluster::complemented_read");
   m_write_op= FALSE;
 
   if (bitmap_is_set_all(table->read_set))
@@ -1964,7 +1964,7 @@ int ha_ndbcluster::peek_indexed_rows(const uchar *record,
   const NdbOperation *first, *last;
   uint i;
   int res;
-  DBUG_ENTER("peek_indexed_rows");
+  DBUG_ENTER("ha_ndbcluster::peek_indexed_rows");
 
   NdbOperation::LockMode lm=
       (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
@@ -2104,7 +2104,7 @@ int ha_ndbcluster::unique_index_read(const uchar *key,
 
 inline int ha_ndbcluster::fetch_next(NdbScanOperation* cursor)
 {
-  DBUG_ENTER("fetch_next");
+  DBUG_ENTER("ha_ndbcluster::fetch_next");
   int local_check;
   NdbTransaction *trans= m_active_trans;
   
@@ -2213,7 +2213,7 @@ inline int ha_ndbcluster::fetch_next(NdbScanOperation* cursor)
 inline int ha_ndbcluster::next_result(uchar *buf)
 {  
   int res;
-  DBUG_ENTER("next_result");
+  DBUG_ENTER("ha_ndbcluster::next_result");
     
   if (!m_active_cursor)
     DBUG_RETURN(HA_ERR_END_OF_FILE);
@@ -2256,7 +2256,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,
   uint tot_len;
   uint i, j;
 
-  DBUG_ENTER("set_bounds");
+  DBUG_ENTER("ha_ndbcluster::set_bounds");
   DBUG_PRINT("info", ("key_parts=%d", key_parts));
 
   for (j= 0; j <= 1; j++)
@@ -2543,7 +2543,7 @@ int ha_ndbcluster::unique_index_scan(const KEY* key_info,
   NdbTransaction *trans= m_active_trans;
   part_id_range part_spec;
 
-  DBUG_ENTER("unique_index_scan");  
+  DBUG_ENTER("ha_ndbcluster::unique_index_scan");  
   DBUG_PRINT("enter", ("Starting new scan on %s", m_tabname));
 
   NdbOperation::LockMode lm=
@@ -2617,7 +2617,7 @@ int ha_ndbcluster::full_table_scan(uchar *buf)
   NdbTransaction *trans= m_active_trans;
   part_id_range part_spec;
 
-  DBUG_ENTER("full_table_scan");  
+  DBUG_ENTER("ha_ndbcluster::full_table_scan");  
   DBUG_PRINT("enter", ("Starting new scan on %s", m_tabname));
   m_write_op= FALSE;
 
@@ -2950,7 +2950,7 @@ int ha_ndbcluster::update_row(const uchar *old_data, uchar *new_data)
   longlong func_value;
   bool pk_update= (table_share->primary_key != MAX_KEY &&
 		   key_cmp(table_share->primary_key, old_data, new_data));
-  DBUG_ENTER("update_row");
+  DBUG_ENTER("ha_ndbcluster::update_row");
   m_write_op= TRUE;
   
   /*
@@ -3154,7 +3154,7 @@ int ha_ndbcluster::delete_row(const uchar *record)
   NdbOperation *op;
   uint32 part_id;
   int error;
-  DBUG_ENTER("delete_row");
+  DBUG_ENTER("ha_ndbcluster::delete_row");
   m_write_op= TRUE;
 
   ha_statistic_increment(&SSV::ha_delete_count);
@@ -3434,7 +3434,7 @@ void ha_ndbcluster::unpack_record(uchar *buf)
 
 void ha_ndbcluster::print_results()
 {
-  DBUG_ENTER("print_results");
+  DBUG_ENTER("ha_ndbcluster::print_results");
 
 #ifndef DBUG_OFF
 
@@ -3701,7 +3701,7 @@ int ha_ndbcluster::read_range_next()
 int ha_ndbcluster::rnd_init(bool scan)
 {
   NdbScanOperation *cursor= m_active_cursor;
-  DBUG_ENTER("rnd_init");
+  DBUG_ENTER("ha_ndbcluster::rnd_init");
   DBUG_PRINT("enter", ("scan: %d", scan));
   // Check if scan is to be restarted
   if (cursor)
@@ -3721,7 +3721,7 @@ int ha_ndbcluster::rnd_init(bool scan)
 int ha_ndbcluster::close_scan()
 {
   NdbTransaction *trans= m_active_trans;
-  DBUG_ENTER("close_scan");
+  DBUG_ENTER("ha_ndbcluster::close_scan");
 
   m_multi_cursor= 0;
   if (!m_active_cursor && !m_multi_cursor)
@@ -3770,14 +3770,14 @@ int ha_ndbcluster::close_scan()
 
 int ha_ndbcluster::rnd_end()
 {
-  DBUG_ENTER("rnd_end");
+  DBUG_ENTER("ha_ndbcluster::rnd_end");
   DBUG_RETURN(close_scan());
 }
 
 
 int ha_ndbcluster::rnd_next(uchar *buf)
 {
-  DBUG_ENTER("rnd_next");
+  DBUG_ENTER("ha_ndbcluster::rnd_next");
   ha_statistic_increment(&SSV::ha_read_rnd_next_count);
 
   if (!m_active_cursor)
@@ -3795,7 +3795,7 @@ int ha_ndbcluster::rnd_next(uchar *buf)
 
 int ha_ndbcluster::rnd_pos(uchar *buf, uchar *pos)
 {
-  DBUG_ENTER("rnd_pos");
+  DBUG_ENTER("ha_ndbcluster::rnd_pos");
   ha_statistic_increment(&SSV::ha_read_rnd_count);
   // The primary key for the record is stored in pos
   // Perform a pk_read using primary key "index"
@@ -3847,7 +3847,7 @@ void ha_ndbcluster::position(const uchar *record)
   uchar *buff;
   uint key_length;
 
-  DBUG_ENTER("position");
+  DBUG_ENTER("ha_ndbcluster::position");
 
   if (table_share->primary_key != MAX_KEY) 
   {
@@ -3931,7 +3931,7 @@ void ha_ndbcluster::position(const uchar *record)
 int ha_ndbcluster::info(uint flag)
 {
   int result= 0;
-  DBUG_ENTER("info");
+  DBUG_ENTER("ha_ndbcluster::info");
   DBUG_PRINT("enter", ("flag: %d", flag));
   
   if (flag & HA_STATUS_POS)
@@ -4032,7 +4032,7 @@ void ha_ndbcluster::get_dynamic_partition_info(PARTITION_INFO *stat_info,
 
 int ha_ndbcluster::extra(enum ha_extra_function operation)
 {
-  DBUG_ENTER("extra");
+  DBUG_ENTER("ha_ndbcluster::extra");
   switch (operation) {
   case HA_EXTRA_IGNORE_DUP_KEY:       /* Dup keys don't rollback everything*/
     DBUG_PRINT("info", ("HA_EXTRA_IGNORE_DUP_KEY"));
@@ -4125,7 +4125,7 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows)
   int bytes, batch;
   const NDBTAB *tab= m_table;    
 
-  DBUG_ENTER("start_bulk_insert");
+  DBUG_ENTER("ha_ndbcluster::start_bulk_insert");
   DBUG_PRINT("enter", ("rows: %d", (int)rows));
   
   m_rows_inserted= (ha_rows) 0;
@@ -4174,7 +4174,7 @@ int ha_ndbcluster::end_bulk_insert()
 {
   int error= 0;
 
-  DBUG_ENTER("end_bulk_insert");
+  DBUG_ENTER("ha_ndbcluster::end_bulk_insert");
   // Check if last inserts need to be flushed
   if (m_bulk_insert_not_flushed)
   {
@@ -4215,7 +4215,7 @@ int ha_ndbcluster::end_bulk_insert()
 
 int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
 {
-  DBUG_ENTER("extra_opt");
+  DBUG_ENTER("ha_ndbcluster::extra_opt");
   DBUG_PRINT("enter", ("cache_size: %lu", cache_size));
   DBUG_RETURN(extra(operation));
 }
@@ -4257,7 +4257,7 @@ THR_LOCK_DATA **ha_ndbcluster::store_lock(THD *thd,
                                           THR_LOCK_DATA **to,
                                           enum thr_lock_type lock_type)
 {
-  DBUG_ENTER("store_lock");
+  DBUG_ENTER("ha_ndbcluster::store_lock");
   if (lock_type != TL_IGNORE && m_lock.type == TL_UNLOCK) 
   {
 
@@ -4375,7 +4375,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
 {
   int error=0;
   NdbTransaction* trans= NULL;
-  DBUG_ENTER("external_lock");
+  DBUG_ENTER("ha_ndbcluster::external_lock");
 
   /*
     Check that this handler instance has a connection
@@ -4591,7 +4591,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
 
 void ha_ndbcluster::unlock_row() 
 {
-  DBUG_ENTER("unlock_row");
+  DBUG_ENTER("ha_ndbcluster::unlock_row");
 
   DBUG_PRINT("info", ("Unlocking row"));
   m_lock_tuple= FALSE;
@@ -4609,7 +4609,7 @@ void ha_ndbcluster::unlock_row()
 int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
 {
   int error=0;
-  DBUG_ENTER("start_stmt");
+  DBUG_ENTER("ha_ndbcluster::start_stmt");
   PRINT_OPTION_FLAGS(thd);
 
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
@@ -5446,7 +5446,7 @@ int ha_ndbcluster::create_handler_files(const char *file,
   size_t length, pack_length;
   int error= 0;
 
-  DBUG_ENTER("create_handler_files");
+  DBUG_ENTER("ha_ndbcluster::create_handler_files");
 
   if (action_flag != CHF_INDEX_FLAG)
   {
@@ -6131,7 +6131,7 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment,
 {
   int cache_size;
   Uint64 auto_value;
-  DBUG_ENTER("get_auto_increment");
+  DBUG_ENTER("ha_ndbcluster::get_auto_increment");
   DBUG_PRINT("enter", ("m_tabname: %s", m_tabname));
   Ndb *ndb= get_ndb();
    
@@ -6238,7 +6238,7 @@ ha_ndbcluster::ha_ndbcluster(handlerton *hton, TABLE_SHARE *table_arg):
 {
   int i;
  
-  DBUG_ENTER("ha_ndbcluster");
+  DBUG_ENTER("ha_ndbcluster::ha_ndbcluster");
 
   m_tabname[0]= '\0';
   m_dbname[0]= '\0';
@@ -6271,7 +6271,7 @@ ha_ndbcluster::~ha_ndbcluster()
 {
   THD *thd= current_thd;
   Ndb *ndb= thd ? check_ndb_in_thd(thd) : g_ndb;
-  DBUG_ENTER("~ha_ndbcluster");
+  DBUG_ENTER("ha_ndbcluster::~ha_ndbcluster");
 
   if (m_share)
   {
@@ -6426,7 +6426,7 @@ void ha_ndbcluster::set_part_info(partition_info *part_info)
 
 int ha_ndbcluster::close(void)
 {
-  DBUG_ENTER("close");
+  DBUG_ENTER("ha_ndbcluster::close");
   THD *thd= table->in_use;
   Ndb *ndb= thd ? check_ndb_in_thd(thd) : g_ndb;
   /* ndb_share reference handler free */
@@ -6442,7 +6442,7 @@ int ha_ndbcluster::close(void)
 Thd_ndb* ha_ndbcluster::seize_thd_ndb()
 {
   Thd_ndb *thd_ndb;
-  DBUG_ENTER("seize_thd_ndb");
+  DBUG_ENTER("ha_ndbcluster::seize_thd_ndb");
 
   thd_ndb= new Thd_ndb();
   if (thd_ndb == NULL)
@@ -6468,7 +6468,7 @@ Thd_ndb* ha_ndbcluster::seize_thd_ndb()
 
 void ha_ndbcluster::release_thd_ndb(Thd_ndb* thd_ndb)
 {
-  DBUG_ENTER("release_thd_ndb");
+  DBUG_ENTER("ha_ndbcluster::release_thd_ndb");
   delete thd_ndb;
   DBUG_VOID_RETURN;
 }
@@ -6498,7 +6498,7 @@ Ndb* check_ndb_in_thd(THD* thd)
 int ha_ndbcluster::check_ndb_connection(THD* thd)
 {
   Ndb *ndb;
-  DBUG_ENTER("check_ndb_connection");
+  DBUG_ENTER("ha_ndbcluster::check_ndb_connection");
   
   if (!(ndb= check_ndb_in_thd(thd)))
     DBUG_RETURN(HA_ERR_NO_CONNECTION);
@@ -7549,7 +7549,7 @@ ha_ndbcluster::records_in_range(uint inx, key_range *min_key,
   uint key_length= key_info->key_length;
   NDB_INDEX_TYPE idx_type= get_index_type(inx);  
 
-  DBUG_ENTER("records_in_range");
+  DBUG_ENTER("ha_ndbcluster::records_in_range");
   // Prevent partial read of hash indexes by returning HA_POS_ERROR
   if ((idx_type == UNIQUE_INDEX || idx_type == PRIMARY_KEY_INDEX) &&
       ((min_key && min_key->length < key_length) ||
@@ -8509,7 +8509,7 @@ int ha_ndbcluster::write_ndb_file(const char *name)
   bool error=1;
   char path[FN_REFLEN];
   
-  DBUG_ENTER("write_ndb_file");
+  DBUG_ENTER("ha_ndbcluster::write_ndb_file");
   DBUG_PRINT("enter", ("name: %s", name));
 
   (void)strxnmov(path, FN_REFLEN-1, 
@@ -8553,7 +8553,7 @@ ha_ndbcluster::null_value_index_search(KEY_MULTI_RANGE *ranges,
 				       KEY_MULTI_RANGE *end_range,
 				       HANDLER_BUFFER *buffer)
 {
-  DBUG_ENTER("null_value_index_search");
+  DBUG_ENTER("ha_ndbcluster::null_value_index_search");
   KEY* key_info= table->key_info + active_index;
   KEY_MULTI_RANGE *range= ranges;
   ulong reclength= table->s->reclength;
@@ -8948,7 +8948,7 @@ found_next:
 int
 ha_ndbcluster::setup_recattr(const NdbRecAttr* curr)
 {
-  DBUG_ENTER("setup_recattr");
+  DBUG_ENTER("ha_ndbcluster::setup_recattr");
 
   Field **field, **end;
   NdbValue *value= m_value;
@@ -9319,7 +9319,7 @@ const
 COND* 
 ha_ndbcluster::cond_push(const COND *cond) 
 { 
-  DBUG_ENTER("cond_push");
+  DBUG_ENTER("ha_ndbcluster::cond_push");
   if (!m_cond) 
     m_cond= new ha_ndbcluster_cond;
   if (!m_cond)
@@ -9554,7 +9554,7 @@ int ha_ndbcluster::set_range_data(void *tab_ref, partition_info *part_info)
   uint i;
   int error= 0;
   bool unsigned_flag= part_info->part_expr->unsigned_flag;
-  DBUG_ENTER("set_range_data");
+  DBUG_ENTER("ha_ndbcluster::set_range_data");
 
   if (!range_data)
   {
@@ -9593,7 +9593,7 @@ int ha_ndbcluster::set_list_data(void *tab_ref, partition_info *part_info)
   uint32 *part_id, i;
   int error= 0;
   bool unsigned_flag= part_info->part_expr->unsigned_flag;
-  DBUG_ENTER("set_list_data");
+  DBUG_ENTER("ha_ndbcluster::set_list_data");
 
   if (!list_data)
   {
@@ -9924,7 +9924,7 @@ int ndbcluster_alter_tablespace(handlerton *hton,
   int error;
   const char *errmsg;
   Ndb *ndb;
-  DBUG_ENTER("ha_ndbcluster::alter_tablespace");
+  DBUG_ENTER("alter_tablespace");
   LINT_INIT(errmsg);
 
   ndb= check_ndb_in_thd(thd);
diff --git a/sql/records.cc b/sql/records.cc
index 81c26da4b4d..0bf815e4073 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -55,6 +55,7 @@ static int rr_index(READ_RECORD *info);
 void init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
                           bool print_error, uint idx)
 {
+  empty_record(table);
   bzero((char*) info,sizeof(*info));
   info->table= table;
   info->file=  table->file;
@@ -161,6 +162,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
   }
   else
   {
+    empty_record(table);
     info->record= table->record[0];
     info->ref_length= table->file->ref_length;
   }
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 71cc431890b..061f931436f 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -105,7 +105,8 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
         DBUG_PRINT("debug", ("field: %s; pack_ptr: 0x%lx;"
                              " pack_ptr':0x%lx; bytes: %d",
                              field->field_name, (ulong) old_pack_ptr,
-                             (ulong) pack_ptr, pack_ptr - old_pack_ptr));
+                             (ulong) pack_ptr,
+                             (int) (pack_ptr - old_pack_ptr)));
       }
 
       null_mask <<= 1;
@@ -239,7 +240,7 @@ unpack_row(Relay_log_info const *rli,
                              " pack_ptr: 0x%lx; pack_ptr': 0x%lx; bytes: %d",
                              f->field_name, metadata,
                              (ulong) old_pack_ptr, (ulong) pack_ptr,
-                             pack_ptr - old_pack_ptr));
+                             (int) (pack_ptr - old_pack_ptr)));
       }
 
       null_mask <<= 1;