diff options
| author | unknown <monty@mysql.com> | 2003-12-21 19:43:23 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-21 19:43:23 +0200 |
| commit | 9385323db8760cf4a48369328967c7f4b7429ae8 (patch) | |
| tree | d789420b7839f2dc9abd44c1aaf2ce0181af6f0f /sql/sql_class.h | |
| parent | 46a9b87a0e8c03afb027227ee7ce7cb6d601ab36 (diff) | |
| parent | 738469384e9f61568aa194e82ddf4e3f2e3d3d37 (diff) | |
| download | mariadb-git-9385323db8760cf4a48369328967c7f4b7429ae8.tar.gz | |
Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0
client/mysqltest.c:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6a93157b3f5..91ffb9bb7d9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -847,8 +847,11 @@ public: inline void end_time() { time(&start_time); } inline void set_time(time_t t) { time_after_lock=start_time=user_time=t; } inline void lock_time() { time(&time_after_lock); } - inline void insert_id(ulonglong id) - { last_insert_id=id; insert_id_used=1; } + inline void insert_id(ulonglong id_arg) + { + last_insert_id= id_arg; + insert_id_used=1; + } inline ulonglong insert_id(void) { if (!last_insert_id_used) |