From 21c55af5a103bcd3133c28073a7cd6e09d0521e3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Jul 2007 17:39:54 -0400 Subject: WL#3228 (NDB) : RBR using different table defs on slave/master Minor refactoring to remove compile warnings and possibly fix the Solaris test failures. sql/log_event.cc: WL#3228 (NDB) : RBR using different table defs on slave/master Minor refactoring. sql/rpl_utility.cc: WL#3228 (NDB) : RBR using different table defs on slave/master Minor refactoring. sql/rpl_utility.h: WL#3228 (NDB) : RBR using different table defs on slave/master Minor refactoring. --- sql/rpl_utility.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/rpl_utility.h') diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index c91113c9e2a..034b6e084af 100644 --- a/sql/rpl_utility.h +++ b/sql/rpl_utility.h @@ -123,7 +123,7 @@ public: */ char *ptr= (char *)&field_metadata[index]; m_field_metadata[i]= sint2korr(ptr); - index= index + sizeof(short int); + index= index + 2; break; } case MYSQL_TYPE_NEWDECIMAL: @@ -238,7 +238,7 @@ public: private: ulong m_size; // Number of elements in the types array field_type *m_type; // Array of type descriptors - short int *m_field_metadata; + uint16 *m_field_metadata; uchar *m_null_bits; uchar *m_memory; }; -- cgit v1.2.1