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
c379f6b0
Commit
c379f6b0
authored
18 years ago
by
sergefp@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#2985: Merge
parent
55380631
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
sql/mysqld.cc
sql/mysqld.cc
+9
-8
sql/sql_partition.cc
sql/sql_partition.cc
+4
-2
No files found.
sql/mysqld.cc
View file @
c379f6b0
...
@@ -6470,24 +6470,24 @@ static int show_ssl_ctx_get_session_cache_mode(THD *thd, SHOW_VAR *var, char *bu
...
@@ -6470,24 +6470,24 @@ static int show_ssl_ctx_get_session_cache_mode(THD *thd, SHOW_VAR *var, char *bu
{
{
var
->
type
=
SHOW_CHAR
;
var
->
type
=
SHOW_CHAR
;
if
(
!
ssl_acceptor_fd
)
if
(
!
ssl_acceptor_fd
)
var
->
value
=
"NONE"
;
var
->
value
=
const_cast
<
char
*>
(
"NONE"
)
;
else
else
switch
(
SSL_CTX_get_session_cache_mode
(
ssl_acceptor_fd
->
ssl_context
))
switch
(
SSL_CTX_get_session_cache_mode
(
ssl_acceptor_fd
->
ssl_context
))
{
{
case
SSL_SESS_CACHE_OFF
:
case
SSL_SESS_CACHE_OFF
:
var
->
value
=
"OFF"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"OFF"
)
;
break
;
case
SSL_SESS_CACHE_CLIENT
:
case
SSL_SESS_CACHE_CLIENT
:
var
->
value
=
"CLIENT"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"CLIENT"
)
;
break
;
case
SSL_SESS_CACHE_SERVER
:
case
SSL_SESS_CACHE_SERVER
:
var
->
value
=
"SERVER"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"SERVER"
)
;
break
;
case
SSL_SESS_CACHE_BOTH
:
case
SSL_SESS_CACHE_BOTH
:
var
->
value
=
"BOTH"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"BOTH"
)
;
break
;
case
SSL_SESS_CACHE_NO_AUTO_CLEAR
:
case
SSL_SESS_CACHE_NO_AUTO_CLEAR
:
var
->
value
=
"NO_AUTO_CLEAR"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"NO_AUTO_CLEAR"
)
;
break
;
case
SSL_SESS_CACHE_NO_INTERNAL_LOOKUP
:
case
SSL_SESS_CACHE_NO_INTERNAL_LOOKUP
:
var
->
value
=
"NO_INTERNAL_LOOKUP"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"NO_INTERNAL_LOOKUP"
)
;
break
;
default:
default:
var
->
value
=
"Unknown"
;
break
;
var
->
value
=
const_cast
<
char
*>
(
"Unknown"
)
;
break
;
}
}
return
0
;
return
0
;
}
}
...
@@ -6508,6 +6508,7 @@ static int show_ssl_session_reused(THD *thd, SHOW_VAR *var, char *buff)
...
@@ -6508,6 +6508,7 @@ static int show_ssl_session_reused(THD *thd, SHOW_VAR *var, char *buff)
*
((
long
*
)
buff
)
=
(
long
)
thd
->
net
.
vio
->
ssl_arg
?
*
((
long
*
)
buff
)
=
(
long
)
thd
->
net
.
vio
->
ssl_arg
?
SSL_session_reused
((
SSL
*
)
thd
->
net
.
vio
->
ssl_arg
)
:
SSL_session_reused
((
SSL
*
)
thd
->
net
.
vio
->
ssl_arg
)
:
0
;
0
;
return
0
;
}
}
static
int
show_ssl_get_default_timeout
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
static
int
show_ssl_get_default_timeout
(
THD
*
thd
,
SHOW_VAR
*
var
,
char
*
buff
)
...
...
This diff is collapsed.
Click to expand it.
sql/sql_partition.cc
View file @
c379f6b0
...
@@ -5878,7 +5878,8 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
...
@@ -5878,7 +5878,8 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info,
}
}
else
else
{
{
if
(
!
part_info
->
get_partition_id
(
part_info
,
&
part_id
))
longlong
dummy
;
if
(
!
part_info
->
get_partition_id
(
part_info
,
&
part_id
,
&
dummy
))
{
{
init_single_partition_iterator
(
part_id
,
part_iter
);
init_single_partition_iterator
(
part_id
,
part_iter
);
return
1
;
/* Ok, iterator initialized */
return
1
;
/* Ok, iterator initialized */
...
@@ -5991,8 +5992,9 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter)
...
@@ -5991,8 +5992,9 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter)
{
{
field
->
store
(
part_iter
->
start_val
,
FALSE
);
field
->
store
(
part_iter
->
start_val
,
FALSE
);
part_iter
->
start_val
++
;
part_iter
->
start_val
++
;
longlong
dummy
;
if
(
!
part_iter
->
part_info
->
get_partition_id
(
part_iter
->
part_info
,
if
(
!
part_iter
->
part_info
->
get_partition_id
(
part_iter
->
part_info
,
&
part_id
))
&
part_id
,
&
dummy
))
return
part_id
;
return
part_id
;
}
}
return
NOT_A_PARTITION_ID
;
return
NOT_A_PARTITION_ID
;
...
...
This diff is collapsed.
Click to expand it.
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