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

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-02-08 15:04:46 +02:00
commit 86c2c89743
87 changed files with 3224 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

43
storage/innobase/row/row0import.cc
View file

@ -45,6 +45,8 @@ Created 2012-02-08 by Sunny Bains.
#include "lzo/lzo1x.h"
#include "snappy-c.h"
#include "log.h"
#include "table.h"
#include "ha_innodb.h"
#include "scope.h"
@ -4228,6 +4230,37 @@ fil_tablespace_iterate(
return(err);
}
static void row_import_autoinc(dict_table_t *table, row_prebuilt_t *prebuilt,
uint64_t autoinc)
{
if (!table->persistent_autoinc)
{
ut_ad(!autoinc);
return;
}
if (autoinc)
{
btr_write_autoinc(dict_table_get_first_index(table), autoinc - 1);
autoinc_set:
table->autoinc= autoinc;
sql_print_information("InnoDB: %`.*s.%`s autoinc value set to " UINT64PF,
int(table->name.dblen()), table->name.m_name,
table->name.basename(), autoinc);
}
else if (TABLE *t= prebuilt->m_mysql_table)
{
if (const Field *ai= t->found_next_number_field)
{
autoinc= 1 +
btr_read_autoinc_with_fallback(table, innodb_col_no(ai),
t->s->mysql_version,
innobase_get_int_col_max_value(ai));
goto autoinc_set;
}
}
}
/*****************************************************************//**
Imports a tablespace. The space id in the .ibd file must match the space id
of the table in the data dictionary.
@ -4565,14 +4598,8 @@ row_import_for_mysql(
table->flags2 &= ~DICT_TF2_DISCARDED & ((1U << DICT_TF2_BITS) - 1);
/* Set autoinc value read from .cfg file, if one was specified.
Otherwise, keep the PAGE_ROOT_AUTO_INC as is. */
if (autoinc) {
ib::info() << table->name << " autoinc value set to "
<< autoinc;
table->autoinc = autoinc--;
btr_write_autoinc(dict_table_get_first_index(table), autoinc);
}
Otherwise, read the PAGE_ROOT_AUTO_INC and set it to table autoinc. */
row_import_autoinc(table, prebuilt, autoinc);
return row_import_cleanup(prebuilt, err);
}