database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-16188 Post merge fixes: trying to get rid of Windows warnings.

Browse Source
This commit is contained in:
Igor Babaev
2019-02-09 10:54:26 -08:00
parent 9fe1e83df0
commit 15fe81c571
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,15 +507,6 @@
VARIABLE_COMMENT Maximum stored procedure recursion depth VARIABLE_COMMENT Maximum stored procedure recursion depth
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 255 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 @@ @@ -2494,7 +2494,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 32 DEFAULT_VALUE 32

4
sql/rowid_filter.h
View File

@ -138,7 +138,7 @@
*/ */
class TABLE; struct TABLE;
class SQL_SELECT; class SQL_SELECT;
class Rowid_filter_container; class Rowid_filter_container;
class Range_rowid_filter_cost_info; class Range_rowid_filter_cost_info;
@ -331,7 +331,7 @@ public:
return array->get_pos(n * elem_size); 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 sort (int (*cmp) (void *ctxt, const void *el1, const void *el2),
void *cmp_arg) void *cmp_arg)

2
sql/sql_explain.cc
View File

@ -1639,7 +1639,7 @@ void Explain_rowid_filter::print_explain_json(Explain_query *query,
writer->add_member("r_selectivity_pct"). writer->add_member("r_selectivity_pct").
add_double(tracker->get_r_selectivity_pct() * 100.0); add_double(tracker->get_r_selectivity_pct() * 100.0);
writer->add_member("r_buffer_size"). 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"). writer->add_member("r_filling_time_ms").
add_double(tracker->get_time_fill_container_ms()); add_double(tracker->get_time_fill_container_ms());
} }