diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 11:15:14 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 11:15:14 +0200 |
| commit | 9a7ad1bf132f1d4fc3f774f4ef2ea66053147f02 (patch) | |
| tree | 70753bb4a01c626c794a46ec976ba9954fd97782 /sql/log_event.cc | |
| parent | 12443de1b2c16970711336defee2e7c3d695d848 (diff) | |
| download | mariadb-git-9a7ad1bf132f1d4fc3f774f4ef2ea66053147f02.tar.gz | |
bug (colcnt) + compile fix
mysql-test/t/disabled.def:
disabled hanging test
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 3164a62d876..9991656c3eb 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5294,12 +5294,11 @@ unpack_row(RELAY_LOG_INFO *rli, if (colcnt == 0) break; - + --colcnt; if (bitmap_is_set(cols, field_ptr - begin_ptr)) { /* Field...::unpack() cannot return 0 */ ptr= f->unpack(f->ptr + offset, ptr); - --colcnt; } else bitmap_clear_bit(write_set, (field_ptr - begin_ptr) + 1); @@ -6076,6 +6075,7 @@ void Table_map_log_event::print(FILE *file, PRINT_EVENT_INFO *print_event_info) } #endif +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #ifndef DBUG_OFF static void print_column_values(char const *text, THD *thd, TABLE *table) @@ -6094,6 +6094,7 @@ print_column_values(char const *text, THD *thd, TABLE *table) table->in_use= old_thd; } #endif +#endif /************************************************************************** Write_rows_log_event member functions |