diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 18:58:30 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 18:58:30 -0400 |
| commit | 38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b (patch) | |
| tree | e35c64b5be509138b8c9340bbb820dbea0ed787c /sql/handler.cc | |
| parent | cd3e15a6f998a74c0f04560bd8243a04e3218d66 (diff) | |
| download | mariadb-git-38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b.tar.gz | |
fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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; |