diff options
| author | unknown <mats@romeo.(none)> | 2007-03-22 09:05:11 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-03-22 09:05:11 +0100 |
| commit | 833ea3fd6843b76cf912be7a7b80c033d55b2518 (patch) | |
| tree | 95f7524f2b6c4cbacd479d5c251d41b542a2b26f /sql/rpl_utility.cc | |
| parent | 8a140cb72eecc8295f847a829ac3c692f0b0ddfd (diff) | |
| parent | 8666675fa95229f1e77c0adc24b5b2f03bd0de6e (diff) | |
| download | mariadb-git-833ea3fd6843b76cf912be7a7b80c033d55b2518.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b23171-mysql-5.1-new-rpl
mysql-test/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
sql/log.cc:
Manual merge
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/slave.cc:
Manual merge
sql/sql_binlog.cc:
Manual merge
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index 65a44a4947b..1d7cc808f0c 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -108,7 +108,7 @@ field_length_from_packed(enum_field_types const field_type, */ int -table_def::compatible_with(RELAY_LOG_INFO *rli, TABLE *table) +table_def::compatible_with(RELAY_LOG_INFO const *rli_arg, TABLE *table) const { /* @@ -116,6 +116,7 @@ table_def::compatible_with(RELAY_LOG_INFO *rli, TABLE *table) */ uint const cols_to_check= min(table->s->fields, size()); int error= 0; + RELAY_LOG_INFO const *rli= const_cast<RELAY_LOG_INFO*>(rli_arg); TABLE_SHARE const *const tsh= table->s; |