diff options
| author | unknown <kent@mysql.com> | 2006-02-28 23:29:58 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-28 23:29:58 +0100 |
| commit | 3addd306a66b146ae5500f1bce5e6ddba036c8e8 (patch) | |
| tree | efd2f0f295954c586163d618728c858a8dde7543 /sql/log_event.h | |
| parent | 59b6ab1fe01f48fb4def09f9565b842aa78e5f8e (diff) | |
| parent | fb936d2a86416127c031f3972f669e1c2b4291b3 (diff) | |
| download | mariadb-git-3addd306a66b146ae5500f1bce5e6ddba036c8e8.tar.gz | |
Merge
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 25e04f66d74..dd68e969ff1 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2005,7 +2005,7 @@ private: #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) gptr m_memory; - byte *m_search_record; + byte *m_after_image; virtual int do_before_row_operations(TABLE *table); virtual int do_after_row_operations(TABLE *table, int error); @@ -2069,7 +2069,7 @@ private: #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) gptr m_memory; byte *m_key; - byte *m_search_record; + byte *m_after_image; virtual int do_before_row_operations(TABLE *table); virtual int do_after_row_operations(TABLE *table, int error); @@ -2139,7 +2139,7 @@ private: #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) gptr m_memory; byte *m_key; - byte *m_search_record; + byte *m_after_image; virtual int do_before_row_operations(TABLE *table); virtual int do_after_row_operations(TABLE *table, int error); |