Commit 18150150 authored by unknown's avatar unknown
Browse files

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 

into hundin.mysql.fi:/home/jan/new/mysql-5.0
parents 9a3de944 08973f5c

sql/ha_innodb.cc

+16 −1
Original line number Diff line number Diff line
@@ -3830,6 +3830,7 @@ ha_innobase::create( 
	char		name2[FN_REFLEN];

	char		norm_name[FN_REFLEN];

	THD		*thd= current_thd;

	ib_longlong     auto_inc_value;



  	DBUG_ENTER("ha_innobase::create");
@@ -4000,6 +4001,20 @@ ha_innobase::create( 


	DBUG_ASSERT(innobase_table != 0);



	if (thd->lex->sql_command == SQLCOM_ALTER_TABLE &&

	   (thd->lex->create_info.used_fields & HA_CREATE_USED_AUTO) &&

	   (thd->lex->create_info.auto_increment_value != 0)) {



		/* Query was ALTER TABLE...AUTO_INC = x; Find out a table

		definition from the dictionary and get the current value

		of the auto increment field. Set a new value to the

		auto increment field if the new value is creater than 

		the current value. */



		auto_inc_value = thd->lex->create_info.auto_increment_value;

		dict_table_autoinc_initialize(innobase_table, auto_inc_value);

	}



	/* Tell the InnoDB server that there might be work for

	utility threads: */