diff options
| author | unknown <serg@serg.mylan> | 2005-02-23 19:20:17 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-23 19:20:17 +0100 |
| commit | 39cab5abecd4b3f544c5e266c4a30b21eb0d996b (patch) | |
| tree | 04a881a4107b3e3f1d8155f1aa710c52acbb89cd /sql/sql_class.h | |
| parent | a2a1449c36c8124c808ab207d92a0749346b9d15 (diff) | |
| parent | be9f1863b7d2ca608926b2a262d22e091555b026 (diff) | |
| download | mariadb-git-39cab5abecd4b3f544c5e266c4a30b21eb0d996b.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/log.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 2d89ded63c2..fa28750721c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -309,7 +309,7 @@ public: bool write(THD *thd, const char *query, uint query_length, time_t query_start=0); bool write(Log_event* event_info); // binary log write - bool write(THD *thd, IO_CACHE *cache); + bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event); /* v stands for vector |