diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:03:28 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:03:28 +0300 |
| commit | b8381eb964cb8a357406353f5000d06261881885 (patch) | |
| tree | b11162ac1a6ea4a0f6b04559f50d2c6e44e51b38 /sql/log_event_old.cc | |
| parent | 0ece5608fc93d761387a0c081a255d06646a691a (diff) | |
| parent | 10ef77fc3bad3ccbcff22ce1e622f2ae96f72f82 (diff) | |
| download | mariadb-git-b8381eb964cb8a357406353f5000d06261881885.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/status.result:
Manual merge with main 5.0 tree.
mysql-test/t/status.test:
Manual merge with main 5.0 tree.
sql/log_event.cc:
Manual merge with main 5.0 tree.
sql/log_event.h:
Manual merge with main 5.0 tree.
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 8663963b35e..35e358001fd 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -5,7 +5,7 @@ #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) int -Write_rows_log_event_old::do_prepare_row(THD *thd, +Write_rows_log_event_old::do_prepare_row(THD *thd_arg, Relay_log_info const *rli, TABLE *table, uchar const *row_start, @@ -25,7 +25,7 @@ Write_rows_log_event_old::do_prepare_row(THD *thd, int -Delete_rows_log_event_old::do_prepare_row(THD *thd, +Delete_rows_log_event_old::do_prepare_row(THD *thd_arg, Relay_log_info const *rli, TABLE *table, uchar const *row_start, @@ -58,7 +58,7 @@ Delete_rows_log_event_old::do_prepare_row(THD *thd, } -int Update_rows_log_event_old::do_prepare_row(THD *thd, +int Update_rows_log_event_old::do_prepare_row(THD *thd_arg, Relay_log_info const *rli, TABLE *table, uchar const *row_start, |