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.cc | |
| 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.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index 279575f33ce..40937e98b27 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -97,7 +97,7 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) { uint from_len= (m_field_metadata[col] >> 8U) & 0x00ff; uint from_bit_len= m_field_metadata[col] & 0x00ff; - DBUG_ASSERT(from_len >= 0 && from_bit_len >= 0 && from_bit_len <= 7); + DBUG_ASSERT(from_bit_len >= 0 && from_bit_len <= 7); length= from_len + ((from_bit_len > 0) ? 1 : 0); break; } @@ -121,7 +121,6 @@ uint32 table_def::calc_field_size(uint col, uchar *master_data) default: length= -1; } - DBUG_ASSERT(length >= 0); return length; } |