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 10.5 into 10.6

Browse Source 
Note: Changes to the test innodb.stats_persistent
in commit e5c4c0842d (MDEV-35443)
are not merged, because the test scenario is impossible
due to commit e66928ab28 (MDEV-33462).
This commit is contained in:
Marko Mäkelä
2025-01-03 09:10:25 +02:00
parent 07b77e862c 24e5d56400
commit f20ee931d8
8 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_base.h
View File

@@ -358,6 +358,7 @@ inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr)
table->maybe_null= embedding->outer_join;
embedding= embedding->embedding;
}
DBUG_ASSERT(tablenr <= MAX_TABLES);
table->tablenr= tablenr;
table->map= (table_map) 1 << tablenr;
table->force_index= table_list->force_index;