diff options
| author | unknown <evgen@moonbone.local> | 2006-07-13 18:16:16 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-13 18:16:16 +0400 |
| commit | 805c33a5e161864c5eee91f02335eb59000c77b2 (patch) | |
| tree | 7f6569df935d07558c6602029f0648e288a95f84 /sql/sql_class.h | |
| parent | a7dddd3b67e70292c0813e80ad255f1dc2f3a867 (diff) | |
| parent | f783a15aada23772e9aae11f9732dd6e9ed095de (diff) | |
| download | mariadb-git-805c33a5e161864c5eee91f02335eb59000c77b2.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 45dc90f25b3..5ed5e68adb9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1324,6 +1324,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; @@ -1455,6 +1457,7 @@ public: { last_insert_id= id_arg; insert_id_used=1; + substitute_null_with_insert_id= TRUE; } inline ulonglong insert_id(void) { |