diff options
| author | unknown <mats@romeo.(none)> | 2006-09-08 11:41:19 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-09-08 11:41:19 +0200 |
| commit | ec36a7aad3c30b6f83a75ef050559207e83e6a0c (patch) | |
| tree | c269e1c404a16b5dc5a214b3e13ad1f778f4da6a /sql | |
| parent | 06ab97125e544c0f2b139e2694c1f7e486f6de5d (diff) | |
| parent | de6b79933cf683b260b03a0b9ed135186fbe708c (diff) | |
| download | mariadb-git-ec36a7aad3c30b6f83a75ef050559207e83e6a0c.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
sql/log_event.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_utility.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index a1ea19a549f..ceacc1eade7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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; } diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index fc706178aa3..5405d022223 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -96,6 +96,8 @@ field_length_from_packed(enum_field_types const field_type, length= ~0UL; // NYI break; } + + return length; } /********************************************************************* |