mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 03:35:34 +02:00
Code Issues Projects Releases Packages Wiki 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


mysql-test/r/odbc.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  merge the test at the end of 4.1 test
mysql-test/t/rpl_insert_id.test:
  merge the test at the end of 4.1 test
sql/sql_class.cc:
  merged
sql/sql_class.h:
  merged
This commit is contained in:
unknown 2006-07-10 16:44:05 +03:00
commit a8a6361b49
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)
{