diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-07-30 17:39:54 -0400 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-07-30 17:39:54 -0400 |
| commit | 21c55af5a103bcd3133c28073a7cd6e09d0521e3 (patch) | |
| tree | a923e10d25fe10c05cc4fa345fd83256896754f2 /sql/rpl_utility.h | |
| parent | d605bc56087145d6ffc3139f5ffcf32c6701fa5c (diff) | |
| download | mariadb-git-21c55af5a103bcd3133c28073a7cd6e09d0521e3.tar.gz | |
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.
Diffstat (limited to 'sql/rpl_utility.h')
| -rw-r--r-- | sql/rpl_utility.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; }; |