From 38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 Jul 2003 18:58:30 -0400 Subject: fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) --- sql/handler.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sql/handler.cc') diff --git a/sql/handler.cc b/sql/handler.cc index 150a0d5329e..7f4b63e7551 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -697,7 +697,10 @@ void handler::update_auto_increment() longlong nr; THD *thd; DBUG_ENTER("update_auto_increment"); - if (table->next_number_field->val_int() != 0) + if (table->auto_increment_field_is_null) + table->auto_increment_field_is_null= false; + else if (table->next_number_field->val_int() != 0 || + current_thd->variables.sql_mode & MODE_NO_AUTO_VALUE_ON_ZERO) { auto_increment_column_changed=0; DBUG_VOID_RETURN; -- cgit v1.2.1