summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <mats@romeo.(none)>2006-08-22 10:36:11 +0200
committerunknown <mats@romeo.(none)>2006-08-22 10:36:11 +0200
commitf17a35a94826905a549ac05ca224e18d852edff4 (patch)
tree0c1096e3d4221e2d6dec9bbcc33823a0745d0e1e /sql/field.cc
parent7ed6333681aa156b193490c224a701ebe897cefb (diff)
downloadmariadb-git-f17a35a94826905a549ac05ca224e18d852edff4.tar.gz
WL#3259 (RBR with more columns on slave than on master):
Post-merge fixes. mysql-test/r/rpl_row_tabledefs_3innodb.result: Result change mysql-test/t/disabled.def: Disabling test that appear to be fixed in other clones sql/field.cc: Post-merge fix sql/log_event.cc: Changes to unpack_row(): - Documentation - New parameter, the write/read set - R/W set now 0-indexed instead of 1-indexed - Removed column value printing Changes to replace_record(): - Documentation - Removed column value printing Removed unused function print_column_values()
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 1fe74d5320f..340f33f1e01 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1255,6 +1255,7 @@ void Field::hash(ulong *nr, ulong *nr2)
CHARSET_INFO *cs= charset();
cs->coll->hash_sort(cs, (uchar*) ptr, len, nr, nr2);
}
+}
my_size_t
Field::do_last_null_byte() const