diff options
| author | unknown <evgen@moonbone.local> | 2006-07-11 17:35:36 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-11 17:35:36 +0400 |
| commit | 7642d18146bc890aad8c2349e342262cbd020c80 (patch) | |
| tree | 4d956b002ea18689ef59f207ab8c9d26f2f112bc /sql/sql_class.h | |
| parent | 8fdac9c74b0dbd7f6c8fc073b1c0e69864840245 (diff) | |
| parent | ca1e4aabfa9593dffe1ab6148e60fb303bad76de (diff) | |
| download | mariadb-git-7642d18146bc890aad8c2349e342262cbd020c80.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
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 f1cf9c7b3e2..e8fe175cd7c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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) { |