database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-07-10 16:44:05 +03:00
parent ece5fff44e 893e92761f
commit 8f71e47a0d
7 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -1321,6 +1321,8 @@ public:
bool no_errors, password, is_fatal_error;
bool query_start_used, rand_used, time_zone_used;
bool last_insert_id_used,insert_id_used, clear_next_insert_id;
/* for IS NULL => = last_insert_id() fix in remove_eq_conds() */
bool substitute_null_with_insert_id;
bool in_lock_tables;
bool query_error, bootstrap, cleanup_done;
bool tmp_table_used;
@ -1452,6 +1454,7 @@ public:
{
last_insert_id= id_arg;
insert_id_used=1;
substitute_null_with_insert_id= TRUE;
}
inline ulonglong insert_id(void)
{