diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-08-20 11:13:31 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-08-20 11:13:31 -0600 |
| commit | 780590641d1cdc1888d91321ed65b3f700555e21 (patch) | |
| tree | 5264f4fde1ef2dee84ed7addfcb088f73b9247ef /sql/rpl_record.cc | |
| parent | 0ece5608fc93d761387a0c081a255d06646a691a (diff) | |
| parent | 3b1ec12f59f28718ef0fbd92412ebec4b87b1fd2 (diff) | |
| download | mariadb-git-780590641d1cdc1888d91321ed65b3f700555e21.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/rpl_record.cc')
| -rw-r--r-- | sql/rpl_record.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc index 8b8eb625bc2..17b759f8426 100644 --- a/sql/rpl_record.cc +++ b/sql/rpl_record.cc @@ -177,6 +177,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols, record on the master side @param rw_set Pointer to bitmap that holds either the read_set or the write_set of the table + @param event_type @retval 0 No error |