1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

bzr merge -rtag:mariadb-10.0.14 maria/10.0/

This commit is contained in:
Nirbhay Choubey
2014-09-28 20:43:56 -04:00
1725 changed files with 61215 additions and 76409 deletions

View File

@@ -3270,15 +3270,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->