Commit dc134323 authored by unknown's avatar unknown
Browse files

Fixed broken auto_increment

parent 317b4074

mysql-test/r/ndb_alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ insert into t1 values 
(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

sql/ha_ndbcluster.cc

+4 −0
Original line number Diff line number Diff line
@@ -1938,8 +1938,12 @@ int ha_ndbcluster::write_row(byte *record) 


    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;

    }