Merge 10.2 into 10.3
This commit is contained in:
commit
79ed33c184
@ -5706,7 +5706,7 @@ static bool xtrabackup_prepare_func(char** argv)
|
|||||||
|
|
||||||
error_cleanup:
|
error_cleanup:
|
||||||
xb_filters_free();
|
xb_filters_free();
|
||||||
return ok;
|
return ok && !ib::error::was_logged();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
|
@ -5450,5 +5450,22 @@ drop procedure p;
|
|||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
#
|
#
|
||||||
|
# MDEV-22591 Debug build crashes on EXECUTE IMMEDIATE '... WHERE ?' USING IGNORE
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (a INT);
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING IGNORE;
|
||||||
|
ERROR HY000: Default/ignore value is not supported for such parameter usage
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING IGNORE;
|
||||||
|
ERROR HY000: Default/ignore value is not supported for such parameter usage
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING 0;
|
||||||
|
a
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING 0;
|
||||||
|
a
|
||||||
|
DROP TABLE t1;
|
||||||
|
EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING DEFAULT;
|
||||||
|
ERROR HY000: Default/ignore value is not supported for such parameter usage
|
||||||
|
EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING 0;
|
||||||
|
Database
|
||||||
|
#
|
||||||
# End of 10.2 tests
|
# End of 10.2 tests
|
||||||
#
|
#
|
||||||
|
@ -4922,6 +4922,23 @@ drop procedure p;
|
|||||||
drop view v1;
|
drop view v1;
|
||||||
drop table t1;
|
drop table t1;
|
||||||
|
|
||||||
|
|
||||||
|
--echo #
|
||||||
|
--echo # MDEV-22591 Debug build crashes on EXECUTE IMMEDIATE '... WHERE ?' USING IGNORE
|
||||||
|
--echo #
|
||||||
|
|
||||||
|
CREATE TABLE t1 (a INT);
|
||||||
|
--error ER_INVALID_DEFAULT_PARAM
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING IGNORE;
|
||||||
|
--error ER_INVALID_DEFAULT_PARAM
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING IGNORE;
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 WHERE ?' USING 0;
|
||||||
|
EXECUTE IMMEDIATE 'SELECT * FROM t1 HAVING ?' USING 0;
|
||||||
|
DROP TABLE t1;
|
||||||
|
--error ER_INVALID_DEFAULT_PARAM
|
||||||
|
EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING DEFAULT;
|
||||||
|
EXECUTE IMMEDIATE 'SHOW DATABASES WHERE ?' USING 0;
|
||||||
|
|
||||||
--echo #
|
--echo #
|
||||||
--echo # End of 10.2 tests
|
--echo # End of 10.2 tests
|
||||||
--echo #
|
--echo #
|
||||||
|
20
mysql-test/main/sp2.result
Normal file
20
mysql-test/main/sp2.result
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
CREATE DATABASE test1;
|
||||||
|
CREATE PROCEDURE test1.sp3() BEGIN END;
|
||||||
|
SHOW PROCEDURE STATUS;
|
||||||
|
Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
|
||||||
|
mtr add_suppression PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci
|
||||||
|
mtr check_testcase PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci
|
||||||
|
mtr check_warnings PROCEDURE root@localhost # # DEFINER utf8 utf8_general_ci latin1_swedish_ci
|
||||||
|
mysql AddGeometryColumn PROCEDURE root@localhost # # INVOKER latin1 latin1_swedish_ci latin1_swedish_ci
|
||||||
|
mysql DropGeometryColumn PROCEDURE root@localhost # # INVOKER latin1 latin1_swedish_ci latin1_swedish_ci
|
||||||
|
test sp2 PROCEDURE root@localhost # # DEFINER latin1 latin1_swedish_ci latin1_swedish_ci
|
||||||
|
test1 sp1 PROCEDURE root@localhost # # DEFINER latin1 latin1_swedish_ci latin1_swedish_ci
|
||||||
|
test1 sp3 PROCEDURE root@localhost # # DEFINER latin1 latin1_swedish_ci latin1_swedish_ci
|
||||||
|
DROP PROCEDURE sp2;
|
||||||
|
DROP DATABASE test1;
|
||||||
|
select count(*) from mysql.event;
|
||||||
|
count(*)
|
||||||
|
416
|
||||||
|
flush tables;
|
||||||
|
show events;
|
||||||
|
truncate table mysql.event;
|
37
mysql-test/main/sp2.test
Normal file
37
mysql-test/main/sp2.test
Normal file
File diff suppressed because one or more lines are too long
@ -20,5 +20,8 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
|
|||||||
SET @binlog_fragment_0='012345';
|
SET @binlog_fragment_0='012345';
|
||||||
BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
|
BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
|
||||||
ERROR 42000: Incorrect argument type to variable 'binlog_fragment_not_exist'
|
ERROR 42000: Incorrect argument type to variable 'binlog_fragment_not_exist'
|
||||||
|
SET @a= '42';
|
||||||
|
BINLOG @a, @a;
|
||||||
|
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use
|
||||||
# Cleanup
|
# Cleanup
|
||||||
DROP TABLE t;
|
DROP TABLE t;
|
||||||
|
@ -41,6 +41,11 @@ SET @binlog_fragment_0='012345';
|
|||||||
--error ER_WRONG_TYPE_FOR_VAR
|
--error ER_WRONG_TYPE_FOR_VAR
|
||||||
BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
|
BINLOG @binlog_fragment_0, @binlog_fragment_not_exist;
|
||||||
|
|
||||||
|
# MDEV-22520
|
||||||
|
SET @a= '42';
|
||||||
|
--error ER_SYNTAX_ERROR
|
||||||
|
BINLOG @a, @a;
|
||||||
|
|
||||||
--echo # Cleanup
|
--echo # Cleanup
|
||||||
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.sql
|
||||||
DROP TABLE t;
|
DROP TABLE t;
|
||||||
|
@ -3571,7 +3571,6 @@ public:
|
|||||||
|
|
||||||
enum Type type() const
|
enum Type type() const
|
||||||
{
|
{
|
||||||
DBUG_ASSERT(fixed || state == NO_VALUE);
|
|
||||||
return item_type;
|
return item_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,8 +158,9 @@ int binlog_defragment(THD *thd)
|
|||||||
memcpy(const_cast<char*>(thd->lex->comment.str) + gathered_length, entry[k]->value,
|
memcpy(const_cast<char*>(thd->lex->comment.str) + gathered_length, entry[k]->value,
|
||||||
entry[k]->length);
|
entry[k]->length);
|
||||||
gathered_length += entry[k]->length;
|
gathered_length += entry[k]->length;
|
||||||
update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0);
|
|
||||||
}
|
}
|
||||||
|
for (uint k=0; k < 2; k++)
|
||||||
|
update_hash(entry[k], true, NULL, 0, STRING_RESULT, &my_charset_bin, 0);
|
||||||
|
|
||||||
DBUG_ASSERT(gathered_length == thd->lex->comment.length);
|
DBUG_ASSERT(gathered_length == thd->lex->comment.length);
|
||||||
|
|
||||||
|
@ -2147,7 +2147,7 @@ void dict_index_remove_from_v_col_list(dict_index_t* index)
|
|||||||
|
|
||||||
for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
|
for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
|
||||||
col = dict_index_get_nth_col(index, i);
|
col = dict_index_get_nth_col(index, i);
|
||||||
if (col->is_virtual()) {
|
if (col && col->is_virtual()) {
|
||||||
vcol = reinterpret_cast<const dict_v_col_t*>(
|
vcol = reinterpret_cast<const dict_v_col_t*>(
|
||||||
col);
|
col);
|
||||||
/* This could be NULL, when we do add
|
/* This could be NULL, when we do add
|
||||||
@ -2319,7 +2319,9 @@ dict_index_remove_from_cache_low(
|
|||||||
ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
|
ut_ad(index->magic_n == DICT_INDEX_MAGIC_N);
|
||||||
ut_ad(mutex_own(&dict_sys->mutex));
|
ut_ad(mutex_own(&dict_sys->mutex));
|
||||||
ut_ad(table->id);
|
ut_ad(table->id);
|
||||||
|
#ifdef BTR_CUR_HASH_ADAPT
|
||||||
ut_ad(!index->freed());
|
ut_ad(!index->freed());
|
||||||
|
#endif /* BTR_CUR_HASH_ADAPT */
|
||||||
|
|
||||||
/* No need to acquire the dict_index_t::lock here because
|
/* No need to acquire the dict_index_t::lock here because
|
||||||
there can't be any active operations on this index (or table). */
|
there can't be any active operations on this index (or table). */
|
||||||
|
@ -322,16 +322,12 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
|
|||||||
@return whether the table will be rebuilt */
|
@return whether the table will be rebuilt */
|
||||||
bool need_rebuild () const { return(old_table != new_table); }
|
bool need_rebuild () const { return(old_table != new_table); }
|
||||||
|
|
||||||
/** Clear uncommmitted added indexes after a failed operation. */
|
/** Clear uncommmitted added indexes after a failed operation. */
|
||||||
void clear_added_indexes()
|
void clear_added_indexes()
|
||||||
{
|
{
|
||||||
for (ulint i = 0; i < num_to_add_index; i++) {
|
for (ulint i= 0; i < num_to_add_index; i++)
|
||||||
if (!add_index[i]->is_committed()) {
|
add_index[i]->detach_columns(true);
|
||||||
add_index[i]->detach_columns();
|
}
|
||||||
add_index[i]->n_fields = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Convert table-rebuilding ALTER to instant ALTER. */
|
/** Convert table-rebuilding ALTER to instant ALTER. */
|
||||||
void prepare_instant()
|
void prepare_instant()
|
||||||
|
@ -574,71 +574,72 @@ struct dict_col_t{
|
|||||||
3072 (REC_VERSION_56_MAX_INDEX_COL_LEN)
|
3072 (REC_VERSION_56_MAX_INDEX_COL_LEN)
|
||||||
bytes. */
|
bytes. */
|
||||||
|
|
||||||
/** Detach the column from an index.
|
/** Detach a virtual column from an index.
|
||||||
@param[in] index index to be detached from */
|
@param index being-freed index */
|
||||||
inline void detach(const dict_index_t& index);
|
inline void detach(const dict_index_t &index);
|
||||||
|
|
||||||
/** Data for instantly added columns */
|
/** Data for instantly added columns */
|
||||||
struct def_t {
|
struct def_t
|
||||||
/** original default value of instantly added column */
|
{
|
||||||
const void* data;
|
/** original default value of instantly added column */
|
||||||
/** len of data, or UNIV_SQL_DEFAULT if unavailable */
|
const void *data;
|
||||||
ulint len;
|
/** len of data, or UNIV_SQL_DEFAULT if unavailable */
|
||||||
} def_val;
|
ulint len;
|
||||||
|
} def_val;
|
||||||
|
|
||||||
/** Retrieve the column name.
|
/** Retrieve the column name.
|
||||||
@param[in] table the table of this column */
|
@param[in] table the table of this column */
|
||||||
const char* name(const dict_table_t& table) const;
|
const char *name(const dict_table_t &table) const;
|
||||||
|
|
||||||
/** @return whether this is a virtual column */
|
/** @return whether this is a virtual column */
|
||||||
bool is_virtual() const { return prtype & DATA_VIRTUAL; }
|
bool is_virtual() const { return prtype & DATA_VIRTUAL; }
|
||||||
/** @return whether NULL is an allowed value for this column */
|
/** @return whether NULL is an allowed value for this column */
|
||||||
bool is_nullable() const { return !(prtype & DATA_NOT_NULL); }
|
bool is_nullable() const { return !(prtype & DATA_NOT_NULL); }
|
||||||
|
|
||||||
/** @return whether table of this system field is TRX_ID-based */
|
/** @return whether table of this system field is TRX_ID-based */
|
||||||
bool vers_native() const
|
bool vers_native() const
|
||||||
{
|
{
|
||||||
ut_ad(vers_sys_start() || vers_sys_end());
|
ut_ad(vers_sys_start() || vers_sys_end());
|
||||||
ut_ad(mtype == DATA_INT || mtype == DATA_FIXBINARY);
|
ut_ad(mtype == DATA_INT || mtype == DATA_FIXBINARY);
|
||||||
return mtype == DATA_INT;
|
return mtype == DATA_INT;
|
||||||
}
|
}
|
||||||
/** @return whether this is system versioned */
|
/** @return whether this is system versioned */
|
||||||
bool is_versioned() const { return !(~prtype & DATA_VERSIONED); }
|
bool is_versioned() const { return !(~prtype & DATA_VERSIONED); }
|
||||||
/** @return whether this is the system version start */
|
/** @return whether this is the system version start */
|
||||||
bool vers_sys_start() const
|
bool vers_sys_start() const
|
||||||
{
|
{
|
||||||
return (prtype & DATA_VERSIONED) == DATA_VERS_START;
|
return (prtype & DATA_VERSIONED) == DATA_VERS_START;
|
||||||
}
|
}
|
||||||
/** @return whether this is the system version end */
|
/** @return whether this is the system version end */
|
||||||
bool vers_sys_end() const
|
bool vers_sys_end() const
|
||||||
{
|
{
|
||||||
return (prtype & DATA_VERSIONED) == DATA_VERS_END;
|
return (prtype & DATA_VERSIONED) == DATA_VERS_END;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return whether this is an instantly-added column */
|
/** @return whether this is an instantly-added column */
|
||||||
bool is_instant() const
|
bool is_instant() const
|
||||||
{
|
{
|
||||||
DBUG_ASSERT(def_val.len != UNIV_SQL_DEFAULT || !def_val.data);
|
DBUG_ASSERT(def_val.len != UNIV_SQL_DEFAULT || !def_val.data);
|
||||||
return def_val.len != UNIV_SQL_DEFAULT;
|
return def_val.len != UNIV_SQL_DEFAULT;
|
||||||
}
|
}
|
||||||
/** Get the default value of an instantly-added column.
|
/** Get the default value of an instantly-added column.
|
||||||
@param[out] len value length (in bytes), or UNIV_SQL_NULL
|
@param[out] len value length (in bytes), or UNIV_SQL_NULL
|
||||||
@return default value
|
@return default value
|
||||||
@retval NULL if the default value is SQL NULL (len=UNIV_SQL_NULL) */
|
@retval NULL if the default value is SQL NULL (len=UNIV_SQL_NULL) */
|
||||||
const byte* instant_value(ulint* len) const
|
const byte *instant_value(ulint *len) const
|
||||||
{
|
{
|
||||||
DBUG_ASSERT(is_instant());
|
DBUG_ASSERT(is_instant());
|
||||||
*len = def_val.len;
|
*len= def_val.len;
|
||||||
return static_cast<const byte*>(def_val.data);
|
return static_cast<const byte*>(def_val.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Remove the 'instant ADD' status of the column */
|
/** Remove the 'instant ADD' status of the column */
|
||||||
void remove_instant()
|
void remove_instant()
|
||||||
{
|
{
|
||||||
DBUG_ASSERT(is_instant());
|
DBUG_ASSERT(is_instant());
|
||||||
def_val.len = UNIV_SQL_DEFAULT;
|
def_val.len= UNIV_SQL_DEFAULT;
|
||||||
def_val.data = NULL;
|
def_val.data= NULL;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Index information put in a list of virtual column structure. Index
|
/** Index information put in a list of virtual column structure. Index
|
||||||
@ -1046,15 +1047,22 @@ struct dict_index_t{
|
|||||||
/** @return whether the index is corrupted */
|
/** @return whether the index is corrupted */
|
||||||
inline bool is_corrupted() const;
|
inline bool is_corrupted() const;
|
||||||
|
|
||||||
/** Detach the columns from the index that is to be freed. */
|
/** Detach the virtual columns from the index that is to be removed.
|
||||||
void detach_columns()
|
@param whether to reset fields[].col */
|
||||||
{
|
void detach_columns(bool clear= false)
|
||||||
if (has_virtual()) {
|
{
|
||||||
for (unsigned i = 0; i < n_fields; i++) {
|
if (!has_virtual())
|
||||||
fields[i].col->detach(*this);
|
return;
|
||||||
}
|
for (unsigned i= 0; i < n_fields; i++)
|
||||||
}
|
{
|
||||||
}
|
dict_col_t* col= fields[i].col;
|
||||||
|
if (!col || !col->is_virtual())
|
||||||
|
continue;
|
||||||
|
col->detach(*this);
|
||||||
|
if (clear)
|
||||||
|
fields[i].col= NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Determine how many fields of a given prefix can be set NULL.
|
/** Determine how many fields of a given prefix can be set NULL.
|
||||||
@param[in] n_prefix number of fields in the prefix
|
@param[in] n_prefix number of fields in the prefix
|
||||||
@ -1194,24 +1202,24 @@ struct dict_index_t{
|
|||||||
inline record_size_info_t record_size_info() const;
|
inline record_size_info_t record_size_info() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Detach a column from an index.
|
/** Detach a virtual column from an index.
|
||||||
@param[in] index index to be detached from */
|
@param index being-freed index */
|
||||||
inline void dict_col_t::detach(const dict_index_t& index)
|
inline void dict_col_t::detach(const dict_index_t &index)
|
||||||
{
|
{
|
||||||
if (!is_virtual()) {
|
ut_ad(is_virtual());
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dict_v_idx_list* v_indexes = reinterpret_cast<const dict_v_col_t*>
|
if (dict_v_idx_list *v_indexes= reinterpret_cast<const dict_v_col_t*>(this)
|
||||||
(this)->v_indexes) {
|
->v_indexes)
|
||||||
for (dict_v_idx_list::iterator i = v_indexes->begin();
|
{
|
||||||
i != v_indexes->end(); i++) {
|
for (dict_v_idx_list::iterator i= v_indexes->begin();
|
||||||
if (i->index == &index) {
|
i != v_indexes->end(); i++)
|
||||||
v_indexes->erase(i);
|
{
|
||||||
return;
|
if (i->index == &index) {
|
||||||
}
|
v_indexes->erase(i);
|
||||||
}
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The status of online index creation */
|
/** The status of online index creation */
|
||||||
|
@ -412,6 +412,14 @@ class error : public logger {
|
|||||||
public:
|
public:
|
||||||
ATTRIBUTE_COLD
|
ATTRIBUTE_COLD
|
||||||
~error();
|
~error();
|
||||||
|
/** Indicates that error::~error() was invoked. Can be used to
|
||||||
|
determine if error messages were logged during innodb code execution.
|
||||||
|
@return true if there were error messages, false otherwise. */
|
||||||
|
static bool was_logged() { return logged; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
/** true if error::~error() was invoked, false otherwise */
|
||||||
|
static bool logged;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** The class fatal is used to emit an error message and stop the server
|
/** The class fatal is used to emit an error message and stop the server
|
||||||
|
@ -6314,7 +6314,7 @@ static my_bool lock_table_locks_lookup(rw_trx_hash_element_t *element,
|
|||||||
ut_ad(lock->trx == element->trx);
|
ut_ad(lock->trx == element->trx);
|
||||||
if (lock_get_type_low(lock) == LOCK_REC)
|
if (lock_get_type_low(lock) == LOCK_REC)
|
||||||
{
|
{
|
||||||
ut_ad(!dict_index_is_online_ddl(lock->index) ||
|
ut_ad(lock->index->online_status != ONLINE_INDEX_CREATION ||
|
||||||
lock->index->is_primary());
|
lock->index->is_primary());
|
||||||
ut_ad(lock->index->table != table);
|
ut_ad(lock->index->table != table);
|
||||||
}
|
}
|
||||||
|
@ -2234,14 +2234,14 @@ AIO::linux_create_io_ctx(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Have tried enough. Better call it a day. */
|
/* Have tried enough. Better call it a day. */
|
||||||
ib::error()
|
ib::warn()
|
||||||
<< "io_setup() failed with EAGAIN after "
|
<< "io_setup() failed with EAGAIN after "
|
||||||
<< OS_AIO_IO_SETUP_RETRY_ATTEMPTS
|
<< OS_AIO_IO_SETUP_RETRY_ATTEMPTS
|
||||||
<< " attempts.";
|
<< " attempts.";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -ENOSYS:
|
case -ENOSYS:
|
||||||
ib::error()
|
ib::warn()
|
||||||
<< "Linux Native AIO interface"
|
<< "Linux Native AIO interface"
|
||||||
" is not supported on this platform. Please"
|
" is not supported on this platform. Please"
|
||||||
" check your OS documentation and install"
|
" check your OS documentation and install"
|
||||||
@ -2250,7 +2250,7 @@ AIO::linux_create_io_ctx(
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
ib::error()
|
ib::warn()
|
||||||
<< "Linux Native AIO setup"
|
<< "Linux Native AIO setup"
|
||||||
<< " returned following error["
|
<< " returned following error["
|
||||||
<< ret << "]";
|
<< ret << "]";
|
||||||
|
@ -578,9 +578,13 @@ warn::~warn()
|
|||||||
sql_print_warning("InnoDB: %s", m_oss.str().c_str());
|
sql_print_warning("InnoDB: %s", m_oss.str().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** true if error::~error() was invoked, false otherwise */
|
||||||
|
bool error::logged;
|
||||||
|
|
||||||
error::~error()
|
error::~error()
|
||||||
{
|
{
|
||||||
sql_print_error("InnoDB: %s", m_oss.str().c_str());
|
sql_print_error("InnoDB: %s", m_oss.str().c_str());
|
||||||
|
logged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
@ -1288,6 +1288,7 @@ static my_bool allocate_head(MARIA_FILE_BITMAP *bitmap, uint size,
|
|||||||
uint byte= 6 * (last_insert_page / 16);
|
uint byte= 6 * (last_insert_page / 16);
|
||||||
first_pattern= last_insert_page % 16;
|
first_pattern= last_insert_page % 16;
|
||||||
data= bitmap->map+byte;
|
data= bitmap->map+byte;
|
||||||
|
first_found= 0; /* Don't update full_head_size */
|
||||||
DBUG_ASSERT(data <= end);
|
DBUG_ASSERT(data <= end);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user