Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
15fe81c5
Commit
15fe81c5
authored
Feb 09, 2019
by
Igor Babaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16188 Post merge fixes: trying to get rid of Windows warnings.
parent
9fe1e83d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
12 deletions
+3
-12
mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
...t/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
+0
-9
sql/rowid_filter.h
sql/rowid_filter.h
+2
-2
sql/sql_explain.cc
sql/sql_explain.cc
+1
-1
No files found.
mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
View file @
15fe81c5
...
...
@@ -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
...
...
sql/rowid_filter.h
View file @
15fe81c5
...
...
@@ -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
)
...
...
sql/sql_explain.cc
View file @
15fe81c5
...
...
@@ -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
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment