Skip to content

Commit 15fe81c

Browse files
committed
MDEV-16188 Post merge fixes: trying to get rid of Windows warnings.
1 parent 9fe1e83 commit 15fe81c

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -507,15 +507,6 @@
507507
VARIABLE_COMMENT Maximum stored procedure recursion depth
508508
NUMERIC_MIN_VALUE 0
509509
NUMERIC_MAX_VALUE 255
510-
@@ -2485,7 +2485,7 @@
511-
VARIABLE_TYPE BIGINT UNSIGNED
512-
VARIABLE_COMMENT The maximum size of the container of a rowid filter
513-
NUMERIC_MIN_VALUE 1024
514-
-NUMERIC_MAX_VALUE 18446744073709551615
515-
+NUMERIC_MAX_VALUE 4294967295
516-
NUMERIC_BLOCK_SIZE 1
517-
ENUM_VALUE_LIST NULL
518-
READ_ONLY NO
519510
@@ -2494,7 +2494,7 @@
520511
GLOBAL_VALUE_ORIGIN COMPILE-TIME
521512
DEFAULT_VALUE 32

sql/rowid_filter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
139139
*/
140140

141-
class TABLE;
141+
struct TABLE;
142142
class SQL_SELECT;
143143
class Rowid_filter_container;
144144
class Range_rowid_filter_cost_info;
@@ -331,7 +331,7 @@ class Refpos_container_sorted_array : public Sql_alloc
331331
return array->get_pos(n * elem_size);
332332
}
333333

334-
uint elements() { return array->elements() / elem_size; }
334+
uint elements() { return (uint) (array->elements() / elem_size); }
335335

336336
void sort (int (*cmp) (void *ctxt, const void *el1, const void *el2),
337337
void *cmp_arg)

sql/sql_explain.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1639,7 +1639,7 @@ void Explain_rowid_filter::print_explain_json(Explain_query *query,
16391639
writer->add_member("r_selectivity_pct").
16401640
add_double(tracker->get_r_selectivity_pct() * 100.0);
16411641
writer->add_member("r_buffer_size").
1642-
add_double(tracker->get_container_buff_size());
1642+
add_double((double) (tracker->get_container_buff_size()));
16431643
writer->add_member("r_filling_time_ms").
16441644
add_double(tracker->get_time_fill_container_ms());
16451645
}

0 commit comments

Comments
 (0)