bk commit into 5.0 tree (mskold:1.1886)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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
  1.1886 05/04/08 12:34:52 mskold@stripped +2 -0
  Fixed broken auto_increment

  sql/ha_ndbcluster.cc
    1.175 05/04/08 12:34:22 mskold@stripped +4 -0
    Fixed broken auto_increment

  mysql-test/r/ndb_alter_table.result
    1.27 05/04/08 12:34:22 mskold@stripped +1 -1
    Fixed broken auto_increment

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.26/mysql-test/r/ndb_alter_table.result	Tue Apr  5 21:31:52 2005
+++ 1.27/mysql-test/r/ndb_alter_table.result	Fri Apr  8 12:34:22 2005
@@ -40,7 +40,7 @@
 (0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7),
(7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7),
(99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);
 show table status;
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	ndbcluster	10	Dynamic	9	96	#	#	0	#	101	#	#	#	latin1_swedish_ci	NULL		#
+t1	ndbcluster	10	Dynamic	9	96	#	#	0	#	102	#	#	#	latin1_swedish_ci	NULL		#
 select * from t1 order by col1;
 col1	col2	col3	col4	col5	col6	to_be_deleted
 0	4	3	5	PENDING	1	7

--- 1.174/sql/ha_ndbcluster.cc	Fri Apr  8 11:49:59 2005
+++ 1.175/sql/ha_ndbcluster.cc	Fri Apr  8 12:34:22 2005
@@ -1938,8 +1938,12 @@
 
     if (has_auto_increment) 
     {
+      THD *thd= table->in_use;
+
       m_skip_auto_increment= FALSE;
       update_auto_increment();
+      /* Ensure that handler is always called for auto_increment values */
+      thd->next_insert_id= 0;
       m_skip_auto_increment= !auto_increment_column_changed;
     }