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
1c4968f2
Commit
1c4968f2
authored
Nov 27, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings
parent
1029b22f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
sql/log.cc
sql/log.cc
+1
-1
sql/rpl_utility.cc
sql/rpl_utility.cc
+4
-4
sql/sql_acl.cc
sql/sql_acl.cc
+2
-3
sql/sql_sequence.cc
sql/sql_sequence.cc
+1
-1
No files found.
sql/log.cc
View file @
1c4968f2
...
...
@@ -2391,7 +2391,7 @@ File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg)
*
errmsg
=
"Could not open log file"
;
goto
err
;
}
if
(
init_io_cache
(
log
,
file
,
binlog_file_cache_size
,
READ_CACHE
,
0
,
0
,
if
(
init_io_cache
(
log
,
file
,
(
size_t
)
binlog_file_cache_size
,
READ_CACHE
,
0
,
0
,
MYF
(
MY_WME
|
MY_DONT_CHECK_FILESIZE
)))
{
sql_print_error
(
"Failed to create a cache on log (file '%s')"
,
...
...
sql/rpl_utility.cc
View file @
1c4968f2
...
...
@@ -141,10 +141,10 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
*/
case
MYSQL_TYPE_TINY_BLOB
:
return
my_set_bits
(
1
*
8
);
return
(
uint32
)
my_set_bits
(
1
*
8
);
case
MYSQL_TYPE_MEDIUM_BLOB
:
return
my_set_bits
(
3
*
8
);
return
(
uint32
)
my_set_bits
(
3
*
8
);
case
MYSQL_TYPE_BLOB
:
case
MYSQL_TYPE_BLOB_COMPRESSED
:
...
...
@@ -153,11 +153,11 @@ max_display_length_for_field(enum_field_types sql_type, unsigned int metadata)
blobs are of type MYSQL_TYPE_BLOB. In that case, we have to look
at the length instead to decide what the max display size is.
*/
return
my_set_bits
(
metadata
*
8
);
return
(
uint32
)
my_set_bits
(
metadata
*
8
);
case
MYSQL_TYPE_LONG_BLOB
:
case
MYSQL_TYPE_GEOMETRY
:
return
my_set_bits
(
4
*
8
);
return
(
uint32
)
my_set_bits
(
4
*
8
);
default:
return
~
(
uint32
)
0
;
...
...
sql/sql_acl.cc
View file @
1c4968f2
...
...
@@ -7367,9 +7367,8 @@ static bool grant_load(THD *thd,
continue
;
}
}
uint
type
=
procs_priv
.
routine_type
()
->
val_int
();
const
Sp_handler
*
sph
=
Sp_handler
::
handler
((
stored_procedure_type
)
type
);
stored_procedure_type
type
=
(
stored_procedure_type
)
procs_priv
.
routine_type
()
->
val_int
();
const
Sp_handler
*
sph
=
Sp_handler
::
handler
(
type
);
if
(
!
sph
||
!
(
hash
=
sph
->
get_priv_hash
()))
{
sql_print_warning
(
"'procs_priv' entry '%s' "
...
...
sql/sql_sequence.cc
View file @
1c4968f2
...
...
@@ -113,7 +113,7 @@ bool sequence_definition::check_and_adjust(bool set_reserved_until)
/* To ensure that cache * real_increment will never overflow */
max_increment
=
(
real_increment
?
labs
(
real_increment
)
:
l
l
abs
(
real_increment
)
:
MAX_AUTO_INCREMENT_VALUE
);
if
(
max_value
>=
start
&&
...
...
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