database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-01 15:08:52 +02:00
parent 72928e640e 65405308a1
commit 6bf8483cac
827 changed files with 11530 additions and 5879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
sql/sql_table.cc
View File

@ -4620,6 +4620,51 @@ int mysql_create_table_no_lock(THD *thd,
return res;
}
#ifdef WITH_WSREP
/** Additional sequence checks for Galera cluster.
@param thd thread handle
@param seq sequence definition
@retval 0 failure
@retval 1 success
*/
bool wsrep_check_sequence(THD* thd, const sequence_definition *seq)
{
enum legacy_db_type db_type;
if (thd->lex->create_info.used_fields & HA_CREATE_USED_ENGINE)
{
db_type= thd->lex->create_info.db_type->db_type;
}
else
{
const handlerton *hton= ha_default_handlerton(thd);
db_type= hton->db_type;
}
// In Galera cluster we support only InnoDB sequences
if (db_type != DB_TYPE_INNODB)
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
"Galera cluster does support only InnoDB sequences");
return(true);
}
// In Galera cluster it is best to use INCREMENT BY 0 with CACHE
// or NOCACHE
if (seq &&
seq->increment &&
seq->cache)
{
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
"In Galera if you use CACHE you should set INCREMENT BY 0"
" to behave correctly in a cluster");
return(true);
}
return (false);
}
#endif /* WITH_WSREP */
/**
Implementation of SQLCOM_CREATE_TABLE.
@ -4689,6 +4734,15 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table,
if (!(thd->variables.option_bits & OPTION_EXPLICIT_DEF_TIMESTAMP))
promote_first_timestamp_column(&alter_info->create_list);
#ifdef WITH_WSREP
if (thd->lex->sql_command == SQLCOM_CREATE_SEQUENCE &&
WSREP(thd) && wsrep_thd_is_local_toi(thd))
{
if (wsrep_check_sequence(thd, create_info->seq_create_info))
DBUG_RETURN(true);
}
#endif /* WITH_WSREP */
/* We can abort create table for any table type */
thd->abort_on_warning= thd->is_strict_mode();
@ -8801,17 +8855,12 @@ fk_check_column_changes(THD *thd, Alter_info *alter_info,
((new_field->flags & NOT_NULL_FLAG) &&
!(old_field->flags & NOT_NULL_FLAG)))
{
if (!(thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS))
{
/*
Column in a FK has changed significantly. Unless
foreign_key_checks are off we prohibit this since this
means values in this column might be changed by ALTER
and thus referential integrity might be broken,
*/
*bad_column_name= column->str;
return FK_COLUMN_DATA_CHANGE;
}
/*
Column in a FK has changed significantly and it
may break referential intergrity.
*/
*bad_column_name= column->str;
return FK_COLUMN_DATA_CHANGE;
}
}
else
@ -10057,6 +10106,15 @@ do_continue:;
}
#endif
#ifdef WITH_WSREP
if (table->s->sequence && WSREP(thd) &&
wsrep_thd_is_local_toi(thd))
{
if (wsrep_check_sequence(thd, create_info->seq_create_info))
DBUG_RETURN(TRUE);
}
#endif /* WITH_WSREP */
/*
Use copy algorithm if:
- old_alter_table system variable is set without in-place requested using
@ -10183,6 +10241,7 @@ do_continue:;
else
alter_info->flags|= ALTER_INDEX_ORDER;
create_info->alias= alter_ctx.table_name;
thd->abort_on_warning= !ignore && thd->is_strict_mode();
/*
Create the .frm file for the new table. Storage engine table will not be
created at this stage.
@ -10199,6 +10258,7 @@ do_continue:;
thd->lex->create_info, create_info, alter_info,
C_ALTER_TABLE_FRM_ONLY, NULL,
&key_info, &key_count, &frm);
thd->abort_on_warning= false;
reenable_binlog(thd);
debug_crash_here("ddl_log_alter_after_create_frm");