Skip to content

Commit 9b5cdee

Browse files
dr-mdr-m
committed
Merge 10.3 into 10.4
2 parents ea2b19d + 2911a9a commit 9b5cdee

File tree

16 files changed

+66
-136
lines changed

16 files changed

+66
-136
lines changed

‎mysql-test/suite/encryption/r/innodb-redo-badkey.result

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
call mtr.add_suppression("Plugin 'file_key_management'");
22
call mtr.add_suppression("Plugin 'InnoDB' init function returned error.");
3-
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file .*test/t[1-4]\\.ibd cannot be decrypted");
3+
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test/t[1-4]\\.ibd' cannot be decrypted");
44
call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
5-
call mtr.add_suppression("InnoDB: Unable to decompress .*.test.t1\\.ibd\\[page id: space=[1-9][0-9]*, page number=[0-9]+\\]");
6-
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t1 page \\[page id: space=[1-9][0-9]*, page number=[0-9]*\\]");
5+
call mtr.add_suppression("InnoDB: Unable to decompress .*.test.t[12]\\.ibd\\[page id: space=[1-9][0-9]*, page number=[0-9]+\\]");
6+
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t[12] page \\[page id: space=[1-9][0-9]*, page number=[0-9]*\\]");
7+
call mtr.add_suppression("InnoDB: Failed to read file '.*' at offset .*");
78
call mtr.add_suppression("InnoDB: Plugin initialization aborted");
89
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
910
# restart: --file-key-management-filename=MYSQL_TEST_DIR/std_data/keys2.txt

‎mysql-test/suite/encryption/t/innodb-redo-badkey.test

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
call mtr.add_suppression("Plugin 'file_key_management'");
77
call mtr.add_suppression("Plugin 'InnoDB' init function returned error.");
8-
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file .*test/t[1-4]\\.ibd cannot be decrypted");
8+
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test/t[1-4]\\.ibd' cannot be decrypted");
99
call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]");
10-
call mtr.add_suppression("InnoDB: Unable to decompress .*.test.t1\\.ibd\\[page id: space=[1-9][0-9]*, page number=[0-9]+\\]");
11-
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t1 page \\[page id: space=[1-9][0-9]*, page number=[0-9]*\\]");
10+
call mtr.add_suppression("InnoDB: Unable to decompress .*.test.t[12]\\.ibd\\[page id: space=[1-9][0-9]*, page number=[0-9]+\\]");
11+
call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t[12] page \\[page id: space=[1-9][0-9]*, page number=[0-9]*\\]");
12+
call mtr.add_suppression("InnoDB: Failed to read file '.*' at offset .*");
1213
call mtr.add_suppression("InnoDB: Plugin initialization aborted");
1314
call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed");
1415

‎mysql-test/suite/innodb_fts/r/fulltext_table_evict.result

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎mysql-test/suite/innodb_fts/t/fulltext_table_evict.test

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎mysql-test/unstable-tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ innodb.xa_recovery : MDEV-15279 - mysqld got exception
623623
#-----------------------------------------------------------------------
624624

625625
innodb_fts.fulltext2 : Modified in 10.4.7
626-
innodb_fts.fulltext_table_evict : Modified in 10.4.8
627626
innodb_fts.innodb_fts_misc : Modified in 10.4.8
628627
innodb_fts.innodb_fts_misc_debug : MDEV-14156 - Unexpected warning
629628
innodb_fts.innodb_fts_plugin : MDEV-13888 - Errors in server log

‎sql/item_cmpfunc.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,9 @@ static bool convert_const_to_int(THD *thd, Item_field *field_item,
321321
TABLE *table= field->table;
322322
sql_mode_t orig_sql_mode= thd->variables.sql_mode;
323323
enum_check_fields orig_count_cuted_fields= thd->count_cuted_fields;
324-
my_bitmap_map *old_maps[2];
324+
my_bitmap_map *old_maps[2] = { NULL, NULL };
325325
ulonglong UNINIT_VAR(orig_field_val); /* original field value if valid */
326326

327-
LINT_INIT_STRUCT(old_maps);
328-
329327
/* table->read_set may not be set if we come here from a CREATE TABLE */
330328
if (table && table->read_set)
331329
dbug_tmp_use_all_columns(table, old_maps,

‎sql/opt_subselect.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,19 @@ class Loose_scan_opt
9595

9696
public:
9797
Loose_scan_opt():
98-
try_loosescan(FALSE),
98+
try_loosescan(false),
9999
bound_sj_equalities(0),
100100
quick_uses_applicable_index(0),
101101
quick_max_loose_keypart(0),
102102
best_loose_scan_key(0),
103103
best_loose_scan_cost(0),
104104
best_loose_scan_records(0),
105105
best_loose_scan_start_key(NULL),
106-
best_max_loose_keypart(0)
106+
best_max_loose_keypart(0),
107+
best_ref_depend_map(0)
107108
{
108109
}
109-
110+
110111
void init(JOIN *join, JOIN_TAB *s, table_map remaining_tables)
111112
{
112113
/*

‎storage/innobase/dict/dict0dict.cc

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ dict_table_open_on_name(
888888
table = dict_table_check_if_in_cache_low(table_name);
889889

890890
if (table == NULL) {
891-
table = dict_load_table(table_name, true, ignore_err);
891+
table = dict_load_table(table_name, ignore_err);
892892
}
893893

894894
ut_ad(!table || table->cached);
@@ -1137,14 +1137,7 @@ dict_make_room_in_cache(
11371137
prev_table = UT_LIST_GET_PREV(table_LRU, table);
11381138

11391139
if (dict_table_can_be_evicted(table)) {
1140-
1141-
DBUG_EXECUTE_IF("crash_if_fts_table_is_evicted",
1142-
{
1143-
if (table->fts &&
1144-
dict_table_has_fts_index(table)) {
1145-
ut_ad(0);
1146-
}
1147-
};);
1140+
ut_ad(!table->fts);
11481141
dict_sys.remove(table, true);
11491142

11501143
++n_evicted;

‎storage/innobase/dict/dict0load.cc

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ NULL. These tables must be subsequently loaded so that all the foreign
6969
key constraints are loaded into memory.
7070
7171
@param[in] name Table name in the db/tablename format
72-
@param[in] cached true=add to cache, false=do not
7372
@param[in] ignore_err Error to be ignored when loading table
7473
and its index definition
7574
@param[out] fk_tables Related table names that must also be
@@ -82,7 +81,6 @@ static
8281
dict_table_t*
8382
dict_load_table_one(
8483
const table_name_t& name,
85-
bool cached,
8684
dict_err_ignore_t ignore_err,
8785
dict_names_t& fk_tables);
8886

@@ -2728,17 +2726,12 @@ the cluster definition if the table is a member in a cluster. Also loads
27282726
all foreign key constraints where the foreign key is in the table or where
27292727
a foreign key references columns in this table.
27302728
@param[in] name Table name in the dbname/tablename format
2731-
@param[in] cached true=add to cache, false=do not
27322729
@param[in] ignore_err Error to be ignored when loading
27332730
table and its index definition
27342731
@return table, NULL if does not exist; if the table is stored in an
27352732
.ibd file, but the file does not exist, then we set the file_unreadable
27362733
flag in the table object we return. */
2737-
dict_table_t*
2738-
dict_load_table(
2739-
const char* name,
2740-
bool cached,
2741-
dict_err_ignore_t ignore_err)
2734+
dict_table_t* dict_load_table(const char* name, dict_err_ignore_t ignore_err)
27422735
{
27432736
dict_names_t fk_list;
27442737
dict_table_t* result;
@@ -2753,12 +2746,12 @@ dict_load_table(
27532746

27542747
if (!result) {
27552748
result = dict_load_table_one(const_cast<char*>(name),
2756-
cached, ignore_err, fk_list);
2749+
ignore_err, fk_list);
27572750
while (!fk_list.empty()) {
27582751
if (!dict_table_check_if_in_cache_low(fk_list.front()))
27592752
dict_load_table_one(
27602753
const_cast<char*>(fk_list.front()),
2761-
cached, ignore_err, fk_list);
2754+
ignore_err, fk_list);
27622755
fk_list.pop_front();
27632756
}
27642757
}
@@ -2851,7 +2844,6 @@ NULL. These tables must be subsequently loaded so that all the foreign
28512844
key constraints are loaded into memory.
28522845
28532846
@param[in] name Table name in the db/tablename format
2854-
@param[in] cached true=add to cache, false=do not
28552847
@param[in] ignore_err Error to be ignored when loading table
28562848
and its index definition
28572849
@param[out] fk_tables Related table names that must also be
@@ -2864,7 +2856,6 @@ static
28642856
dict_table_t*
28652857
dict_load_table_one(
28662858
const table_name_t& name,
2867-
bool cached,
28682859
dict_err_ignore_t ignore_err,
28692860
dict_names_t& fk_tables)
28702861
{
@@ -2953,10 +2944,8 @@ dict_load_table_one(
29532944

29542945
dict_table_add_system_columns(table, heap);
29552946

2956-
if (cached) {
2957-
table->can_be_evicted = true;
2958-
table->add_to_cache();
2959-
}
2947+
table->can_be_evicted = true;
2948+
table->add_to_cache();
29602949

29612950
mem_heap_empty(heap);
29622951

@@ -2994,7 +2983,7 @@ dict_load_table_one(
29942983
}
29952984
}
29962985

2997-
if (err == DB_SUCCESS && cached && table->is_readable()) {
2986+
if (err == DB_SUCCESS && table->is_readable()) {
29982987
if (table->space && !fil_space_get_size(table->space_id)) {
29992988
corrupted:
30002989
table->corrupted = true;
@@ -3038,7 +3027,7 @@ dict_load_table_one(
30383027
of the error condition, since the user may want to dump data from the
30393028
clustered index. However we load the foreign key information only if
30403029
all indexes were loaded. */
3041-
if (!cached || !table->is_readable()) {
3030+
if (!table->is_readable()) {
30423031
/* Don't attempt to load the indexes from disk. */
30433032
} else if (err == DB_SUCCESS) {
30443033
err = dict_load_foreigns(table->name.m_name, NULL,
@@ -3190,7 +3179,7 @@ dict_load_table_on_id(
31903179
/* Load the table definition to memory */
31913180
char* table_name = mem_heap_strdupl(
31923181
heap, (char*) field, len);
3193-
table = dict_load_table(table_name, true, ignore_err);
3182+
table = dict_load_table(table_name, ignore_err);
31943183
}
31953184
}
31963185
}

‎storage/innobase/handler/ha_innodb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12460,7 +12460,7 @@ int create_table_info_t::create_table(bool create_fk)
1246012460
DICT_ERR_IGNORE_NONE,
1246112461
fk_tables);
1246212462
while (err == DB_SUCCESS && !fk_tables.empty()) {
12463-
dict_load_table(fk_tables.front(), true,
12463+
dict_load_table(fk_tables.front(),
1246412464
DICT_ERR_IGNORE_NONE);
1246512465
fk_tables.pop_front();
1246612466
}

0 commit comments

Comments
 (0)