Commit 665e5575 authored by unknown's avatar unknown
Browse files

Merge fix-up. 


vio/viossl.c:
  We prefer "0x%lx" to "%p".
parent aff965c3

sql/sql_view.cc

+14 −1
Original line number Diff line number Diff line
@@ -573,6 +573,19 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, 
    }

    append_identifier(thd, &buff, views->table_name,

                      views->table_name_length);

    if (lex->view_list.elements)

    {

      List_iterator_fast<LEX_STRING> names(lex->view_list);

      LEX_STRING *name;

      int i;



      for (i= 0; name= names++; i++)

      {

        buff.append(i ? ", " : "(");

        append_identifier(thd, &buff, name->str, name->length);

      }

      buff.append(')');

    }

    buff.append(STRING_WITH_LEN(" AS "));

    buff.append(views->source.str, views->source.length);
@@ -1378,7 +1391,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
      error= TRUE;

    query_cache_invalidate3(thd, view, 0);

    sp_cache_invalidate();



  }

  if (mysql_bin_log.is_open())

  {

    thd->clear_error();

vio/viossl.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int vio_ssl_read(Vio *vio, gptr buf, int size) 
{

  int r;

  DBUG_ENTER("vio_ssl_read");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d, ssl_: 0x%p",

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d, ssl_: 0x%lx",

		       vio->sd, buf, size, vio->ssl_arg));



  r= SSL_read((SSL*) vio->ssl_arg, buf, size);
@@ -99,7 +99,7 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size) 
{

  int r;

  DBUG_ENTER("vio_ssl_write");

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));

  DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d", vio->sd, buf, size));



  r= SSL_write((SSL*) vio->ssl_arg, buf, size);

#ifndef DBUG_OFF