mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
This commit is contained in:
mats@romeo.(none) 2006-09-08 11:41:19 +02:00
commit 26c831f75d
2 changed files with 3 additions and 1 deletions
Show stats 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 (*field_ptr)
*master_reclength = (*field_ptr)->ptr - table->record[0];
*master_reclength = (*field_ptr)->ptr - (char*) table->record[0];
else
*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
break;
}
return length;
}
/*********************************************************************