bk commit into 5.0 tree (gkodinov:1.2207)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge 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-10 16:44:05+03:00, gkodinov@stripped +6 -0
  Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
  into  macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
  MERGE: 1.1616.2144.171

  mysql-test/r/odbc.result@stripped, 2006-07-10 16:28:07+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.1

  mysql-test/r/rpl_insert_id.result@stripped, 2006-07-10 16:43:57+03:00, gkodinov@stripped +1 -2
    merge the test at the end of 4.1 test
    MERGE: 1.10.1.2

  mysql-test/t/rpl_insert_id.test@stripped, 2006-07-10 16:43:57+03:00, gkodinov@stripped +5 -4
    merge the test at the end of 4.1 test
    MERGE: 1.9.1.3

  sql/sql_class.cc@stripped, 2006-07-10 16:43:57+03:00, gkodinov@stripped +1 -1
    merged
    MERGE: 1.105.1.102

  sql/sql_class.h@stripped, 2006-07-10 16:43:58+03:00, gkodinov@stripped +2 -2
    merged
    MERGE: 1.146.52.14

  sql/sql_select.cc@stripped, 2006-07-10 16:28:09+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.216.125.9

# 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:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B14553-5.0-opt/RESYNC

--- 1.236/sql/sql_class.cc	2006-07-10 16:44:21 +03:00
+++ 1.237/sql/sql_class.cc	2006-07-10 16:44:21 +03:00
@@ -269,6 +269,7 @@
   tablespace_op=FALSE;
   ulong tmp=sql_rnd_with_mutex();
   randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::query_id);
+  substitute_null_with_insert_id = FALSE;
   thr_lock_info_init(&lock_info); /* safety: will be reset after start */
   thr_lock_owner_init(&main_lock_id, &lock_info);
 }

--- 1.292/sql/sql_class.h	2006-07-10 16:44:21 +03:00
+++ 1.293/sql/sql_class.h	2006-07-10 16:44:21 +03:00
@@ -1321,6 +1321,8 @@
   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 @@
   {
     last_insert_id= id_arg;
     insert_id_used=1;
+    substitute_null_with_insert_id= TRUE;
   }
   inline ulonglong insert_id(void)
   {

--- 1.428/sql/sql_select.cc	2006-07-10 16:44:22 +03:00
+++ 1.429/sql/sql_select.cc	2006-07-10 16:44:22 +03:00
@@ -7854,7 +7854,7 @@
       Field *field=((Item_field*) args[0])->field;
       if (field->flags & AUTO_INCREMENT_FLAG && !field->table->maybe_null &&
 	  (thd->options & OPTION_AUTO_IS_NULL) &&
-	  thd->insert_id())
+	  thd->insert_id() && thd->substitute_null_with_insert_id)
       {
 #ifdef HAVE_QUERY_CACHE
 	query_cache_abort(&thd->net);
@@ -7873,7 +7873,7 @@
           */
 	  cond->fix_fields(thd, &cond);
 	}
-	thd->insert_id(0);		// Clear for next request
+	thd->substitute_null_with_insert_id= FALSE;   // Clear for next request
       }
       /* fix to replace 'NULL' dates with '0' (shreeve@stripped) */
       else if (((field->type() == FIELD_TYPE_DATE) ||

--- 1.9/mysql-test/r/odbc.result	2006-07-10 16:44:22 +03:00
+++ 1.10/mysql-test/r/odbc.result	2006-07-10 16:44:22 +03:00
@@ -14,3 +14,14 @@
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
 drop table t1;
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY);
+INSERT INTO t1 VALUES (NULL);
+SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
+a	last_insert_id()
+1	1
+SELECT sql_no_cache a, last_insert_id() FROM t1 WHERE a IS NULL;
+a	last_insert_id()
+SELECT sql_no_cache a, last_insert_id() FROM t1;
+a	last_insert_id()
+1	1
+DROP TABLE t1;

--- 1.14/mysql-test/r/rpl_insert_id.result	2006-07-10 16:44:22 +03:00
+++ 1.15/mysql-test/r/rpl_insert_id.result	2006-07-10 16:44:22 +03:00
@@ -73,7 +73,20 @@
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
+drop table if exists t1, t2;
+create table t1(a int auto_increment, key(a));
+create table t2(a int);
+insert into t1 (a) values (null);
+insert into t2 (a) select a from t1 where a is null;
+insert into t2 (a) select a from t1 where a is null;
+select * from t2;
+a
+1
+select * from t2;
+a
+1
 drop table t1;
+drop table t2;
 drop function if exists bug15728;
 drop function if exists bug15728_insert;
 drop table if exists t1, t2;

--- 1.16/mysql-test/t/rpl_insert_id.test	2006-07-10 16:44:22 +03:00
+++ 1.17/mysql-test/t/rpl_insert_id.test	2006-07-10 16:44:22 +03:00
@@ -77,6 +77,25 @@
 connection master;
 drop table t1;
 sync_slave_with_master;
+ 
+#
+# Bug#14553: NULL in WHERE resets LAST_INSERT_ID
+#
+connection master;
+drop table if exists t1,t2;
+create table t1(a int auto_increment, key(a));
+create table t2(a int);
+insert into t1 (a) values (null);
+insert into t2 (a) select a from t1 where a is null;
+insert into t2 (a) select a from t1 where a is null;
+select * from t2;
+sync_slave_with_master;
+connection slave;
+select * from t2;
+connection master;
+drop table t1;
+drop table t2;
+sync_slave_with_master;
 # End of 4.1 tests