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
92f1837a
Commit
92f1837a
authored
Jul 01, 2017
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compilation warnings (while testing 32 bit builds)
parent
cc8912f2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
sql/item_func.cc
sql/item_func.cc
+1
-1
storage/connect/fmdlex.c
storage/connect/fmdlex.c
+1
-1
storage/connect/tabmysql.cpp
storage/connect/tabmysql.cpp
+1
-1
storage/maria/ma_test2.c
storage/maria/ma_test2.c
+2
-2
storage/tokudb/PerconaFT/ft/loader/dbufio.cc
storage/tokudb/PerconaFT/ft/loader/dbufio.cc
+1
-1
storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
+2
-2
storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
+2
-2
No files found.
sql/item_func.cc
View file @
92f1837a
...
...
@@ -3918,7 +3918,7 @@ longlong Item_master_gtid_wait::val_int()
{
DBUG_ASSERT
(
fixed
==
1
);
longlong
result
=
0
;
String
*
gtid_pos
=
args
[
0
]
->
val_str
(
&
value
);
String
*
gtid_pos
__attribute__
((
unused
))
=
args
[
0
]
->
val_str
(
&
value
);
if
(
args
[
0
]
->
null_value
)
{
...
...
storage/connect/fmdlex.c
View file @
92f1837a
...
...
@@ -529,7 +529,7 @@ YY_DECL
pp
->
Num
=
0
;
if
(
pp
->
InFmt
)
{
*
pp
->
InFmt
=
'\0'
;
pp
->
InFmt
[
pp
->
Outsize
-
1
]
=
'\0'
;
}
if
(
pp
->
OutFmt
)
{
*
pp
->
OutFmt
=
'\0'
;
pp
->
OutFmt
[
pp
->
Outsize
-
1
]
=
'\0'
;
}
pp
->
Curp
=
pp
->
Format
;
pp
->
Curp
=
(
char
*
)
pp
->
Format
;
yy_init
=
1
;
/* This is a new input */
...
...
storage/connect/tabmysql.cpp
View file @
92f1837a
...
...
@@ -124,7 +124,7 @@ bool MYSQLDEF::GetServerInfo(PGLOBAL g, const char *server_name)
DBUG_RETURN
(
true
);
}
// endif server
DBUG_PRINT
(
"info"
,
(
"get_server_by_name returned server at %
l
x"
,
DBUG_PRINT
(
"info"
,
(
"get_server_by_name returned server at %
z
x"
,
(
size_t
)
server
));
// TODO: We need to examine which of these can really be NULL
...
...
storage/maria/ma_test2.c
View file @
92f1837a
...
...
@@ -1006,8 +1006,8 @@ w_requests: %10lu\n\
writes: %10lu
\n
\
r_requests: %10lu
\n
\
reads: %10lu
\n
"
,
maria_pagecache
->
blocks_used
,
maria_pagecache
->
global_blocks_changed
,
(
ulong
)
maria_pagecache
->
blocks_used
,
(
ulong
)
maria_pagecache
->
global_blocks_changed
,
(
ulong
)
maria_pagecache
->
global_cache_w_requests
,
(
ulong
)
maria_pagecache
->
global_cache_write
,
(
ulong
)
maria_pagecache
->
global_cache_r_requests
,
...
...
storage/tokudb/PerconaFT/ft/loader/dbufio.cc
View file @
92f1837a
...
...
@@ -566,7 +566,7 @@ dbufio_print(DBUFIO_FILESET bfs) {
fprintf
(
stderr
,
"%s:%d bfs=%p"
,
__FILE__
,
__LINE__
,
bfs
);
if
(
bfs
->
panic
)
fprintf
(
stderr
,
" panic=%d"
,
bfs
->
panic_errno
);
fprintf
(
stderr
,
" N=%d %d %"
PRIuMAX
,
bfs
->
N
,
bfs
->
n_not_done
,
bfs
->
bufsize
);
fprintf
(
stderr
,
" N=%d %d %"
PRIuMAX
,
bfs
->
N
,
bfs
->
n_not_done
,
(
uintmax_t
)
bfs
->
bufsize
);
for
(
int
i
=
0
;
i
<
bfs
->
N
;
i
++
)
{
struct
dbufio_file
*
dbf
=
&
bfs
->
files
[
i
];
if
(
dbf
->
error_code
[
0
]
||
dbf
->
error_code
[
1
])
...
...
storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
View file @
92f1837a
...
...
@@ -761,7 +761,7 @@ int toku_serialize_ftnode_to_memory(FTNODE node,
// Zero the rest of the buffer
memset
(
data
+
total_node_size
,
0
,
total_buffer_size
-
total_node_size
);
assert
(
curr_ptr
-
data
==
total_node_size
);
assert
(
(
uint32_t
)
(
curr_ptr
-
data
)
==
total_node_size
);
*
bytes_to_write
=
data
;
*
n_bytes_to_write
=
total_buffer_size
;
*
n_uncompressed_bytes
=
total_uncompressed_size
;
...
...
@@ -2699,7 +2699,7 @@ decompress_from_raw_block_into_rbuf(uint8_t *raw_block, size_t raw_block_size, s
// decompress all the compressed sub blocks into the uncompressed buffer
r
=
decompress_all_sub_blocks
(
n_sub_blocks
,
sub_block
,
compressed_data
,
uncompressed_data
,
num_cores
,
ft_pool
);
if
(
r
!=
0
)
{
fprintf
(
stderr
,
"%s:%d block %"
PRId64
" failed %d at %p size %
l
u
\n
"
,
__FUNCTION__
,
__LINE__
,
blocknum
.
b
,
r
,
raw_block
,
raw_block_size
);
fprintf
(
stderr
,
"%s:%d block %"
PRId64
" failed %d at %p size %
z
u
\n
"
,
__FUNCTION__
,
__LINE__
,
blocknum
.
b
,
r
,
raw_block
,
raw_block_size
);
dump_bad_block
(
raw_block
,
raw_block_size
);
goto
exit
;
}
...
...
storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
View file @
92f1837a
...
...
@@ -970,11 +970,11 @@ int toku_txn_manager_recover_root_txn (
txn_manager
->
last_xid_seen_for_recover
=
curr_txn
->
txnid
.
parent_id64
;
// if we found the maximum number of prepared transactions we are
// allowed to find, then break
if
(
num_txns_returned
>=
count
)
{
if
(
(
long
)
num_txns_returned
>=
count
)
{
break
;
}
}
invariant
(
num_txns_returned
<=
count
);
invariant
(
(
long
)
num_txns_returned
<=
count
);
*
retp
=
num_txns_returned
;
ret_val
=
0
;
exit:
...
...
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