database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 09:40:29 +02:00
parent 662fe08232 ba4f8e317d
commit 06988bdcaa
60 changed files with 1773 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_alter.h
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2010, 2014, Oracle and/or its affiliates.
Copyright (c) 2013, 2020, MariaDB Corporation.
Copyright (c) 2013, 2021, MariaDB Corporation.
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
@@ -315,9 +315,9 @@ public:
void report_implicit_default_value_error(THD *thd, const TABLE_SHARE *) const;
public:
Create_field *implicit_default_value_error_field;
bool error_if_not_empty;
uint tables_opened;
Create_field *implicit_default_value_error_field= nullptr;
bool error_if_not_empty= false;
uint tables_opened= 0;
LEX_CSTRING db;
LEX_CSTRING table_name;
LEX_CSTRING storage_engine_name;
@@ -339,13 +339,14 @@ public:
of table to the new version ER_FK_CANNOT_DELETE_PARENT error should be
emitted.
*/
bool fk_error_if_delete_row;
bool fk_error_if_delete_row= false;
/** Name of foreign key for the above error. */
const char *fk_error_id;
const char *fk_error_id= nullptr;
/** Name of table for the above error. */
const char *fk_error_table;
const char *fk_error_table= nullptr;
bool modified_primary_key= false;
/** Indicates that we are altering temporary table */
bool tmp_table;
bool tmp_table= false;
private:
char new_filename[FN_REFLEN + 1];