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.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-27 08:01:47 +02:00
parent ba81009f63 191209d8ab
commit ab0f2a00b6
463 changed files with 4278 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@@ -11632,7 +11632,8 @@ do_continue:;
- Neither old or new engine uses files from another engine
The above is mainly true for the sequence and the partition engine.
*/
engine_changed= ((new_table->file->ht != table->file->ht) &&
engine_changed= ((new_table->file->storage_ht() !=
table->file->storage_ht()) &&
((!(new_table->file->ha_table_flags() & HA_FILE_BASED) ||
!(table->file->ha_table_flags() & HA_FILE_BASED))) &&
!(table->file->ha_table_flags() & HA_REUSES_FILE_NAMES) &&
@@ -11667,7 +11668,7 @@ do_continue:;
debug_crash_here("ddl_log_alter_after_copy"); // Use old table
/*
We are new ready to use the new table. Update the state in the
We are now ready to use the new table. Update the state in the
ddl log so that we recovery know that the new table is ready and
in case of crash it should use the new one and log the query
to the binary log.