diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-03 17:21:28 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-03 17:21:28 +0400 |
| commit | 48759d7ae9522b2dc03d058c33e8b45471263fc3 (patch) | |
| tree | 34f77edd4783806c80ba502c900b8e855978143a /sql/sql_select.cc | |
| parent | 4fca6870ea40bdf170345c2edee6eb72a7f7a7a0 (diff) | |
| parent | e9ec03f9367e00c47ef9666ea7fae21f78326e91 (diff) | |
| download | mariadb-git-48759d7ae9522b2dc03d058c33e8b45471263fc3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 274251f2df3..6d17faf8509 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8165,11 +8165,11 @@ remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value) 21)))) { /* - Set THD::last_insert_id_used manually, as this statement - uses LAST_INSERT_ID() in a sense, and should issue - LAST_INSERT_ID_EVENT. + Set THD::last_insert_id_used_bin_log manually, as this + statement uses LAST_INSERT_ID() in a sense, and should + issue LAST_INSERT_ID_EVENT. */ - thd->last_insert_id_used= TRUE; + thd->last_insert_id_used_bin_log= TRUE; cond=new_cond; /* |