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

Merge branch '11.8' into main

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-18 12:07:02 +02:00
parent cb2d6abae1 805e7ca3ad
commit 9b824e62d4
871 changed files with 11314 additions and 6371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@@ -11968,7 +11968,8 @@ alter_copy:
- 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) &&
@@ -12003,7 +12004,7 @@ alter_copy:
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.