~drizzle-trunk/drizzle/development

MErge Stewart

added added

removed removed

1367

1368

assert(next_insert_id >= auto_inc_interval_for_cur_row.minimum());

1369

1370

if ((nr= table->next_number_field->val_int()) != 0)

1370

/* We check for auto_increment_field_not_null as 0 is an explicit value

1371

for an auto increment column, not a magic value like NULL is.

1372

same as sql_mode=NO_AUTO_VALUE_ON_ZERO */

1373

1374

if ((nr= table->next_number_field->val_int()) != 0

1375

|| table->auto_increment_field_not_null)

1371

1376

{

1372

1377

1373

1378

Update next_insert_id if we had already generated a value in this