Commit 5a6285c5 authored by unknown's avatar unknown
Browse files

WL#2985: Merge 


sql/mysqld.cc:
  Fix compile warnings (as directed by Serg)
parent 18a1e69e

sql/mysqld.cc

+9 −8
Original line number Diff line number Diff line
@@ -6470,24 +6470,24 @@ static int show_ssl_ctx_get_session_cache_mode(THD *thd, SHOW_VAR *var, char *bu 
{

  var->type= SHOW_CHAR;

  if (!ssl_acceptor_fd)

    var->value= "NONE";

    var->value= const_cast<char*>("NONE");

  else

    switch (SSL_CTX_get_session_cache_mode(ssl_acceptor_fd->ssl_context))

    {

    case SSL_SESS_CACHE_OFF:

      var->value= "OFF"; break;

      var->value= const_cast<char*>("OFF"); break;

    case SSL_SESS_CACHE_CLIENT:

      var->value= "CLIENT"; break;

      var->value= const_cast<char*>("CLIENT"); break;

    case SSL_SESS_CACHE_SERVER:

      var->value= "SERVER"; break;

      var->value= const_cast<char*>("SERVER"); break;

    case SSL_SESS_CACHE_BOTH:

      var->value= "BOTH"; break;

      var->value= const_cast<char*>("BOTH"); break;

    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:

      var->value= "NO_INTERNAL_LOOKUP"; break;

      var->value= const_cast<char*>("NO_INTERNAL_LOOKUP"); break;

    default:

      var->value= "Unknown"; break;

      var->value= const_cast<char*>("Unknown"); break;

    }

  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 ?

                         SSL_session_reused((SSL*) thd->net.vio->ssl_arg) :

                         0;

  return 0;

}



static int show_ssl_get_default_timeout(THD *thd, SHOW_VAR *var, char *buff)

sql/sql_partition.cc

+4 −2
Original line number Diff line number Diff line
@@ -5878,7 +5878,8 @@ int get_part_iter_for_interval_via_walking(partition_info *part_info, 
    }

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

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

    part_iter->start_val++;

    longlong dummy;

    if (!part_iter->part_info->get_partition_id(part_iter->part_info, 

                                                &part_id))

                                                &part_id, &dummy))

      return part_id;

  }

  return NOT_A_PARTITION_ID;