mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
2e814d4702
Contains also
MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7
The failure happened because 5.7 has changed the signature of
the bool handler::primary_key_is_clustered() const
virtual function ("const" was added). InnoDB was using the old
signature which caused the function not to be used.
MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7
Fixed mutexing problem on lock_trx_handle_wait. Note that
rpl_parallel and rpl_optimistic_parallel tests still
fail.
MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
Reason: incorrect merge
MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
Reason: incorrect merge
76 lines
2.4 KiB
C++
76 lines
2.4 KiB
C++
/*****************************************************************************
|
|
|
|
Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/*******************************************************************//**
|
|
@file ut/ut0vec.cc
|
|
A vector of pointers to data items
|
|
|
|
Created 4/6/2006 Osku Salerma
|
|
************************************************************************/
|
|
|
|
#include "ut0vec.h"
|
|
#ifdef UNIV_NONINL
|
|
#include "ut0vec.ic"
|
|
#endif
|
|
#include "mem0mem.h"
|
|
|
|
/********************************************************************
|
|
Create a new vector with the given initial size. */
|
|
ib_vector_t*
|
|
ib_vector_create(
|
|
/*=============*/
|
|
/* out: vector */
|
|
ib_alloc_t* allocator, /* in: vector allocator */
|
|
ulint sizeof_value, /* in: size of data item */
|
|
ulint size) /* in: initial size */
|
|
{
|
|
ib_vector_t* vec;
|
|
|
|
ut_a(size > 0);
|
|
|
|
vec = static_cast<ib_vector_t*>(
|
|
allocator->mem_malloc(allocator, sizeof(*vec)));
|
|
|
|
vec->used = 0;
|
|
vec->total = size;
|
|
vec->allocator = allocator;
|
|
vec->sizeof_value = sizeof_value;
|
|
|
|
vec->data = static_cast<void*>(
|
|
allocator->mem_malloc(allocator, vec->sizeof_value * size));
|
|
|
|
return(vec);
|
|
}
|
|
|
|
/********************************************************************
|
|
Resize the vector, currently the vector can only grow and we
|
|
expand the number of elements it can hold by 2 times. */
|
|
void
|
|
ib_vector_resize(
|
|
/*=============*/
|
|
ib_vector_t* vec) /* in: vector */
|
|
{
|
|
ulint new_total = vec->total * 2;
|
|
ulint old_size = vec->used * vec->sizeof_value;
|
|
ulint new_size = new_total * vec->sizeof_value;
|
|
|
|
vec->data = static_cast<void*>(vec->allocator->mem_resize(
|
|
vec->allocator, vec->data, old_size, new_size));
|
|
|
|
vec->total = new_total;
|
|
}
|