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 epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt

Browse Source 
into  moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
This commit is contained in:
evgen@moonbone.local
2006-07-11 17:35:36 +04:00
parent dbc1ca22a0 893e92761f
commit a65bf3bf90
12 changed files with 123 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

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