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

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-04 07:41:35 +02:00
parent 7d4b2b9847 fe449affcf
commit b6ebadaa66
344 changed files with 13374 additions and 5521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_table.cc
View File

@ -59,6 +59,7 @@
#include "debug.h" // debug_crash_here()
#include <algorithm>
#include "wsrep_mysqld.h"
#include "sql_debug.h"
#ifdef _WIN32
#include <io.h>
@ -3760,6 +3761,13 @@ without_overlaps_err:
thd->mem_root))
DBUG_RETURN(TRUE);
#ifndef DBUG_OFF
DBUG_EXECUTE_IF("key",
Debug_key::print_keys(thd, "prep_create_table: ",
*key_info_buffer, *key_count);
);
#endif
DBUG_RETURN(FALSE);
}
@ -9635,7 +9643,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
DEBUG_SYNC(thd, "alter_opened_table");
#ifdef WITH_WSREP
#if defined WITH_WSREP && defined ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.alter_opened_table",
{
const char act[]=