database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

Browse Source 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
This commit is contained in:
unknown
2006-09-08 11:41:19 +02:00
parent 06ab97125e de6b79933c
commit ec36a7aad3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log_event.cc
View File

@ -5369,7 +5369,7 @@ unpack_row(RELAY_LOG_INFO *rli,
if (master_reclength) if (master_reclength)
{ {
if (*field_ptr) if (*field_ptr)
*master_reclength = (*field_ptr)->ptr - table->record[0]; *master_reclength = (*field_ptr)->ptr - (char*) table->record[0];
else else
*master_reclength = table->s->reclength; *master_reclength = table->s->reclength;
} }

2
sql/rpl_utility.cc
View File

@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type,
length= ~0UL; // NYI length= ~0UL; // NYI
break; break;
} }
return length;
} }
/********************************************************************* /*********************************************************************