diff options
| author | unknown <kostja@bodhi.local> | 2006-11-02 01:08:39 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-02 01:08:39 +0300 |
| commit | b6102f671398ac5ccf1b6f1ed0226ee6719e0935 (patch) | |
| tree | 5d5deeab993fb48853f3373233849f8d87d0423a /sql/set_var.cc | |
| parent | 1e64687b86f51a3606efe510cf97dcf6dd4bc8f8 (diff) | |
| parent | 9280d33474adb8d5848f6467f18e578b740bd3cb (diff) | |
| download | mariadb-git-b6102f671398ac5ccf1b6f1ed0226ee6719e0935.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1clone-4.1.22-build
into bodhi.local:/opt/local/work/mysql-4.1-runtime
mysql-test/r/ps.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 21370821dff..4433b6bf7d8 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2404,8 +2404,12 @@ bool sys_var_last_insert_id::update(THD *thd, set_var *var) byte *sys_var_last_insert_id::value_ptr(THD *thd, enum_var_type type, LEX_STRING *base) { - thd->sys_var_tmp.long_value= (long) thd->insert_id(); - return (byte*) &thd->last_insert_id; + /* + As this statement reads @@LAST_INSERT_ID, set + THD::last_insert_id_used. + */ + thd->last_insert_id_used= TRUE; + return (byte*) &thd->current_insert_id; } |