database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0

Browse Source 
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
This commit is contained in:
unknown
2003-12-21 19:43:23 +02:00
parent 46a9b87a0e 738469384e
commit 9385323db8
13 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -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)