diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 18:52:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 19:07:25 +0300 |
| commit | 37c14690fc6bc9237bdad9b8e26157d1174a49fc (patch) | |
| tree | 490ab3103b3f2dbef654fdd860e891ccde87d93c /sql/opt_split.cc | |
| parent | aae3f921adec9b9d1bff093c9a75a94e44f5c8d4 (diff) | |
| parent | e2f1f88fa60680cb87833a7cceb172f5d436a804 (diff) | |
| download | mariadb-git-37c14690fc6bc9237bdad9b8e26157d1174a49fc.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/opt_split.cc')
| -rw-r--r-- | sql/opt_split.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_split.cc b/sql/opt_split.cc index b27a0d757cb..a6031f75a5b 100644 --- a/sql/opt_split.cc +++ b/sql/opt_split.cc @@ -966,7 +966,7 @@ SplM_plan_info * JOIN_TAB::choose_best_splitting(double record_count, The plan for the chosen key has not been found in the cache. Build a new plan and save info on it in the cache */ - table_map all_table_map= (1 << join->table_count) - 1; + table_map all_table_map= (((table_map) 1) << join->table_count) - 1; reset_validity_vars_for_keyuses(best_key_keyuse_ext_start, best_table, best_key, remaining_tables, true); choose_plan(join, all_table_map & ~join->const_table_map); |