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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e0a08c56
Commit
e0a08c56
authored
May 07, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compilation warnings.
openssl compilation problem.
parent
b381cf84
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
12 deletions
+6
-12
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.c
+1
-2
storage/maria/ma_search.c
storage/maria/ma_search.c
+3
-7
storage/xtradb/os/os0file.c
storage/xtradb/os/os0file.c
+1
-2
vio/viossl.c
vio/viossl.c
+1
-1
No files found.
storage/maria/ma_loghandler.c
View file @
e0a08c56
...
@@ -7472,9 +7472,8 @@ static void translog_force_current_buffer_to_finish()
...
@@ -7472,9 +7472,8 @@ static void translog_force_current_buffer_to_finish()
struct
st_translog_buffer
*
old_buffer
=
log_descriptor
.
bc
.
buffer
;
struct
st_translog_buffer
*
old_buffer
=
log_descriptor
.
bc
.
buffer
;
uchar
*
data
=
log_descriptor
.
bc
.
ptr
-
log_descriptor
.
bc
.
current_page_fill
;
uchar
*
data
=
log_descriptor
.
bc
.
ptr
-
log_descriptor
.
bc
.
current_page_fill
;
uint16
left
=
TRANSLOG_PAGE_SIZE
-
log_descriptor
.
bc
.
current_page_fill
;
uint16
left
=
TRANSLOG_PAGE_SIZE
-
log_descriptor
.
bc
.
current_page_fill
;
uint16
current_page_fill
,
write_counter
,
previous_offset
;
uint16
UNINIT_VAR
(
current_page_fill
)
,
write_counter
,
previous_offset
;
DBUG_ENTER
(
"translog_force_current_buffer_to_finish"
);
DBUG_ENTER
(
"translog_force_current_buffer_to_finish"
);
LINT_INIT
(
current_page_fill
);
DBUG_PRINT
(
"enter"
,
(
"Buffer #%u 0x%lx "
DBUG_PRINT
(
"enter"
,
(
"Buffer #%u 0x%lx "
"Buffer addr: (%lu,0x%lx) "
"Buffer addr: (%lu,0x%lx) "
...
...
storage/maria/ma_search.c
View file @
e0a08c56
...
@@ -424,9 +424,9 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
...
@@ -424,9 +424,9 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
flag is the value returned by ha_key_cmp and as treated as final
flag is the value returned by ha_key_cmp and as treated as final
*/
*/
int
flag
=
0
,
my_flag
=-
1
;
int
flag
=
0
,
my_flag
=-
1
;
uint
nod_flag
,
length
,
len
,
matched
,
cmplen
,
kseg_len
;
uint
nod_flag
,
UNINIT_VAR
(
length
)
,
len
,
matched
,
cmplen
,
kseg_len
;
uint
page_flag
,
prefix_len
,
suffix_len
;
uint
page_flag
,
UNINIT_VAR
(
prefix_len
)
,
suffix_len
;
int
key_len_skip
,
seg_len_pack
,
key_len_left
;
int
key_len_skip
,
UNINIT_VAR
(
seg_len_pack
)
,
key_len_left
;
uchar
*
end
,
*
vseg
,
*
UNINIT_VAR
(
saved_vseg
),
*
UNINIT_VAR
(
saved_from
);
uchar
*
end
,
*
vseg
,
*
UNINIT_VAR
(
saved_vseg
),
*
UNINIT_VAR
(
saved_from
);
uchar
*
page
;
uchar
*
page
;
uchar
tt_buff
[
MARIA_MAX_KEY_BUFF
+
2
],
*
t_buff
=
tt_buff
+
2
;
uchar
tt_buff
[
MARIA_MAX_KEY_BUFF
+
2
],
*
t_buff
=
tt_buff
+
2
;
...
@@ -439,10 +439,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
...
@@ -439,10 +439,6 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
const
uchar
*
sort_order
=
keyinfo
->
seg
->
charset
->
sort_order
;
const
uchar
*
sort_order
=
keyinfo
->
seg
->
charset
->
sort_order
;
DBUG_ENTER
(
"_ma_prefix_search"
);
DBUG_ENTER
(
"_ma_prefix_search"
);
LINT_INIT
(
seg_len_pack
);
LINT_INIT
(
prefix_len
);
LINT_INIT
(
length
);
t_buff
[
0
]
=
0
;
/* Avoid bugs */
t_buff
[
0
]
=
0
;
/* Avoid bugs */
page_flag
=
ma_page
->
flag
;
page_flag
=
ma_page
->
flag
;
nod_flag
=
ma_page
->
node
;
nod_flag
=
ma_page
->
node
;
...
...
storage/xtradb/os/os0file.c
View file @
e0a08c56
...
@@ -1462,7 +1462,6 @@ os_file_set_nocache(
...
@@ -1462,7 +1462,6 @@ os_file_set_nocache(
#endif
#endif
static
int
os_file_set_atomic_writes
(
os_file_t
file
,
const
char
*
name
)
static
int
os_file_set_atomic_writes
(
os_file_t
file
,
const
char
*
name
)
{
{
static
int
first_time
=
1
;
int
atomic_option
=
1
;
int
atomic_option
=
1
;
int
ret
=
ioctl
(
file
,
DFS_IOCTL_ATOMIC_WRITE_SET
,
&
atomic_option
);
int
ret
=
ioctl
(
file
,
DFS_IOCTL_ATOMIC_WRITE_SET
,
&
atomic_option
);
...
@@ -2138,7 +2137,7 @@ os_file_set_size(
...
@@ -2138,7 +2137,7 @@ os_file_set_size(
"InnoDB: Error: preallocating data for"
"InnoDB: Error: preallocating data for"
" file %s failed at
\n
"
" file %s failed at
\n
"
"InnoDB: offset 0 size %lld %lld. Operating system"
"InnoDB: offset 0 size %lld %lld. Operating system"
" error number %
llu
.
\n
"
" error number %
d
.
\n
"
"InnoDB: Check that the disk is not full"
"InnoDB: Check that the disk is not full"
" or a disk quota exceeded.
\n
"
" or a disk quota exceeded.
\n
"
"InnoDB: Some operating system error numbers"
"InnoDB: Some operating system error numbers"
...
...
vio/viossl.c
View file @
e0a08c56
...
@@ -183,7 +183,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
...
@@ -183,7 +183,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
SSL_clear
(
ssl
);
SSL_clear
(
ssl
);
SSL_SESSION_set_timeout
(
SSL_get_session
(
ssl
),
timeout
);
SSL_SESSION_set_timeout
(
SSL_get_session
(
ssl
),
timeout
);
SSL_set_fd
(
ssl
,
vio
->
sd
);
SSL_set_fd
(
ssl
,
vio
->
sd
);
#if
ndef HAVE_YASSL
#if
!defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
SSL_set_options
(
ssl
,
SSL_OP_NO_COMPRESSION
);
SSL_set_options
(
ssl
,
SSL_OP_NO_COMPRESSION
);
#endif
#endif
...
...
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