revision-id: 15fe81c571ef81ec834ac91f96c9adb4343ecd05 (mariadb-10.3.6-111-g15fe81c) parent(s): 9fe1e83df0be36b6b3bea4ff67cc513f73e94c6e author: Igor Babaev committer: Igor Babaev timestamp: 2019-02-09 10:54:26 -0800 message: MDEV-16188 Post merge fixes: trying to get rid of Windows warnings. --- .../suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff | 9 --------- sql/rowid_filter.h | 4 ++-- sql/sql_explain.cc | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff index d57c342..cb9e84b 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff @@ -507,15 +507,6 @@ VARIABLE_COMMENT Maximum stored procedure recursion depth NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 255 -@@ -2485,7 +2485,7 @@ - VARIABLE_TYPE BIGINT UNSIGNED - VARIABLE_COMMENT The maximum size of the container of a rowid filter - NUMERIC_MIN_VALUE 1024 --NUMERIC_MAX_VALUE 18446744073709551615 -+NUMERIC_MAX_VALUE 4294967295 - NUMERIC_BLOCK_SIZE 1 - ENUM_VALUE_LIST NULL - READ_ONLY NO @@ -2494,7 +2494,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 32 diff --git a/sql/rowid_filter.h b/sql/rowid_filter.h index ddeb13a..3195e76 100644 --- a/sql/rowid_filter.h +++ b/sql/rowid_filter.h @@ -138,7 +138,7 @@ */ -class TABLE; +struct TABLE; class SQL_SELECT; class Rowid_filter_container; class Range_rowid_filter_cost_info; @@ -331,7 +331,7 @@ class Refpos_container_sorted_array : public Sql_alloc return array->get_pos(n * elem_size); } - uint elements() { return array->elements() / elem_size; } + uint elements() { return (uint) (array->elements() / elem_size); } void sort (int (*cmp) (void *ctxt, const void *el1, const void *el2), void *cmp_arg) diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index d5575dd..a53b357 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -1639,7 +1639,7 @@ void Explain_rowid_filter::print_explain_json(Explain_query *query, writer->add_member("r_selectivity_pct"). add_double(tracker->get_r_selectivity_pct() * 100.0); writer->add_member("r_buffer_size"). - add_double(tracker->get_container_buff_size()); + add_double((double) (tracker->get_container_buff_size())); writer->add_member("r_filling_time_ms"). add_double(tracker->get_time_fill_container_ms()); }