database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

WL#2985: Merge

Browse Source
This commit is contained in:
sergefp@mysql.com
2006-01-18 21:29:48 +03:00
parent 55380631cc
commit c379f6b0ba
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/mysqld.cc
View File

@ -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)
*((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)

6
sql/sql_partition.cc
View File

@ -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)
{ {
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;