Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-07-11 19:13:15+04:00, evgen@stripped +2 -0
Merge epotemkin@stripped:/home/bk/mysql-4.1
into moonbone.local:/work/16302-bug-4.1-opt-mysql
MERGE: 1.2520.1.3
sql/sql_class.cc@stripped, 2006-07-11 19:13:13+04:00, evgen@stripped +0 -0
Auto merged
MERGE: 1.206.2.1
sql/sql_class.h@stripped, 2006-07-11 19:13:13+04:00, evgen@stripped +0 -0
Auto merged
MERGE: 1.285.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: evgen
# Host: moonbone.local
# Root: /work/16302-bug-4.1-opt-mysql/RESYNC
--- 1.208/sql/sql_class.cc 2006-07-11 19:13:18 +04:00
+++ 1.209/sql/sql_class.cc 2006-07-11 19:13:18 +04:00
@@ -265,6 +265,7 @@
ulong tmp=sql_rnd_with_mutex();
randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id);
}
+ substitute_null_with_insert_id = FALSE;
}
--- 1.286/sql/sql_class.h 2006-07-11 19:13:18 +04:00
+++ 1.287/sql/sql_class.h 2006-07-11 19:13:18 +04:00
@@ -896,6 +896,8 @@
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 @@
{
last_insert_id= id_arg;
insert_id_used=1;
+ substitute_null_with_insert_id= TRUE;
}
inline ulonglong insert_id(void)
{
| Thread |
|---|
| • bk commit into 4.1 tree (evgen:1.2533) | eugene | 15 Jul |
