Commit a74e9b97 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
parents a2c533ce 4eb10f0b

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fa 
#rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement

rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly

rpl_row_func003          : BUG#19074 2006-13-04 andrei  test failed

rpl_sp                   : BUG#16456 2006-02-16 jmiller

rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl

sql/ha_innodb.cc

+7 −1
Original line number Diff line number Diff line
@@ -7067,10 +7067,16 @@ ha_innobase::innobase_read_and_init_auto_inc( 
		'found_next_number_field' below because MySQL in SHOW TABLE

		STATUS does not seem to set 'next_number_field'. The comment

		in table.h says that 'next_number_field' is set when it is

		'active'. */

		'active'.

		Since 5.1 MySQL enforces that we announce fields which we will

		read; as we only do a val_*() call, dbug_tmp_use_all_columns()

		with read_set is sufficient. */



		my_bitmap_map *old_map;

		old_map= dbug_tmp_use_all_columns(table, table->read_set);

		auto_inc = (longlong) table->found_next_number_field->

				val_int_offset(table->s->rec_buff_length) + 1;

		dbug_tmp_restore_column_map(table->read_set, old_map);

	}



	dict_table_autoinc_initialize(prebuilt->table, auto_inc);