diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-10-09 17:25:08 -0400 |
| commit | 068fb8569f2300e4a5c08413a756417d923ecf5f (patch) | |
| tree | ab008f1be51ee322cbeeb5aa73042430a6e63347 /sql/handler.cc | |
| parent | 59277a7d83374bc293cd58f8be509a81792d829e (diff) | |
| parent | dbda20caffbb22115b6f30069b716bc505c49d11 (diff) | |
| download | mariadb-git-068fb8569f2300e4a5c08413a756417d923ecf5f.tar.gz | |
bzr merge -rtag:mariadb-5.5.40 maria/5.5
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0c165f6940d..53c875da6a2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2890,15 +2890,10 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment, if (error) { if (error == HA_ERR_END_OF_FILE || error == HA_ERR_KEY_NOT_FOUND) - { - /* No entry found, start with 1. */ - nr= 1; - } + /* No entry found, that's fine */; else - { - DBUG_ASSERT(0); - nr= ULONGLONG_MAX; - } + print_error(error, MYF(0)); + nr= 1; } else nr= ((ulonglong) table->next_number_field-> |