database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong)

Browse Source 
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value


mysys/thr_alarm.c:
  Remove warning from valgrind
sql/item_strfunc.cc:
  Fixed indentation
tests/mysql_client_test.c:
  Removed compiler warning
This commit is contained in:
unknown
2005-05-18 10:41:35 +03:00
parent 2398f9d6f2
commit ef342b743e
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/handler.cc
View File

@@ -1376,7 +1376,19 @@ next_insert_id(ulonglong nr,struct system_variables *variables)
/*
Updates columns with type NEXT_NUMBER if:
Update the auto_increment field if necessary
SYNOPSIS
update_auto_increment()
RETURN
0 ok
1 get_auto_increment() was called and returned ~(ulonglong) 0
IMPLEMENTATION
Updates columns with type NEXT_NUMBER if:
- If column value is set to NULL (in which case
auto_increment_field_not_null is 0)
@@ -1415,12 +1427,13 @@ next_insert_id(ulonglong nr,struct system_variables *variables)
thd->next_insert_id is cleared after it's been used for a statement.
*/
void handler::update_auto_increment()
bool handler::update_auto_increment()
{
ulonglong nr;
THD *thd= table->in_use;
struct system_variables *variables= &thd->variables;
bool auto_increment_field_not_null;
bool result= 0;
DBUG_ENTER("handler::update_auto_increment");
/*
@@ -1449,11 +1462,13 @@ void handler::update_auto_increment()
thd->next_insert_id= nr;
DBUG_PRINT("info",("next_insert_id: %lu", (ulong) nr));
}
DBUG_VOID_RETURN;
DBUG_RETURN(0);
}
if (!(nr= thd->next_insert_id))
{
nr= get_auto_increment();
if ((nr= get_auto_increment()) == ~(ulonglong) 0)
result= 1; // Mark failure
if (variables->auto_increment_increment != 1)
nr= next_insert_id(nr-1, variables);
/*
@@ -1493,7 +1508,7 @@ void handler::update_auto_increment()
/* Mark that we generated a new value */
auto_increment_column_changed=1;
DBUG_VOID_RETURN;
DBUG_RETURN(result);
}
/*