diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-03 20:28:59 +0200 |
| commit | 9cd171e2dc8743f96c710039e7348426e9bff045 (patch) | |
| tree | cf5c75ae32d43145e6aabe382f84c222a2328a7d /sql/log.cc | |
| parent | 1535da6592ed6e0ca63a06c46a123a77b30879b3 (diff) | |
| parent | 48759d7ae9522b2dc03d058c33e8b45471263fc3 (diff) | |
| download | mariadb-git-9cd171e2dc8743f96c710039e7348426e9bff045.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 212c6403666..960fc4f60c2 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1705,7 +1705,7 @@ bool MYSQL_LOG::write(Log_event *event_info) if (thd) { - if (thd->last_insert_id_used) + if (thd->last_insert_id_used_bin_log) { Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT, thd->current_insert_id); @@ -1997,7 +1997,7 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length, tmp_errno=errno; strmov(db,thd->db); } - if (thd->last_insert_id_used) + if (thd->last_insert_id_used_bin_log) { end=strmov(end,",last_insert_id="); end=longlong10_to_str((longlong) thd->current_insert_id,end,-10); |