mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Temporary commit of 10.0-merge

Browse source
This commit is contained in:
Michael Widenius 2013-03-26 00:03:13 +02:00
commit 068c61978e
649 changed files with 90817 additions and 25330 deletions
Download patch file Download diff file Expand all files Collapse all files

13
storage/innobase/include/ut0vec.ic
View file

@ -346,9 +346,10 @@ ib_vector_remove(
ib_vector_t* vec, /*!< in: vector */
const void* elem) /*!< in: value to remove */
{
void* current;
void* current = NULL;
void* next;
ulint i;
ulint old_used_count = vec->used;
for (i = 0; i < vec->used; i++) {
current = ib_vector_get(vec, i);
@ -359,14 +360,14 @@ ib_vector_remove(
}
next = ib_vector_get(vec, i + 1);
memcpy(current, next, vec->sizeof_value
* (vec->used - i - 1));
memmove(current, next, vec->sizeof_value
* (vec->used - i - 1));
--vec->used;
break;
}
}
--vec->used;
return(current);
return((old_used_count != vec->used) ? current : NULL);
}
/********************************************************************