database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

bzr merge -rtag:mariadb-5.5.40 maria/5.5

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-10-09 17:25:08 -04:00
parent 59277a7d83 dbda20caff
commit 068fb8569f
1508 changed files with 27992 additions and 72557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/handler.cc
View File

@ -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->