mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
corrected manual merge
This commit is contained in:
parent
4097b6eb62
commit
6dceef95f7
1 changed files with 2 additions and 1 deletions
|
@ -6089,7 +6089,8 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment,
|
|||
const NdbError err= ndb->getNdbError();
|
||||
sql_print_error("Error %lu in ::get_auto_increment(): %s",
|
||||
(ulong) err.code, err.message);
|
||||
DBUG_RETURN(~(ulonglong) 0);
|
||||
*first_value= ~(ulonglong) 0;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue