Merge work:/home/bk/mysql

into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -40597,6 +40597,13 @@ added to 3.23.
 @appendixsubsec Changes in release 3.23.32
 @itemize @bullet
 @item
+Fixed coredump when client aborted connection without mysql_close()
+@item
+Fixed bug in RESTORE TABLE when trying to restore from a non-existing
+directory
+@item
+Fixed coredump on the slave replicating SET PASSWORD
+@item
 Added MASTER_POS_WAIT()
 @end itemize
 

configure.in

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 3.23.31)
+AM_INIT_AUTOMAKE(mysql, 3.23.32)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

mysys/test_vsnprintf.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
-
-#include "mysys_priv.h"
-
-static void my_printf(const char * fmt, ...)
-{
-  char buf[32];
-  int n;
-  va_list ar;
-  va_start(ar, fmt);
-  n = my_vsnprintf(buf, sizeof(buf),fmt, ar);
-  printf(buf);
-  printf("n=%d, strlen=%d\n", n, strlen(buf));
-  va_end(ar);
-}
-
-int main()
-{
-  
-  my_printf("Hello\n");
-  my_printf("Hello int, %d\n", 1);
-  my_printf("Hello string '%s'\n", "I am a string");
-  my_printf("Hello hack hack hack hack hack hack hack %d\n", 1);
-  my_printf("Hello %d hack  %d\n", 1, 4);
-  my_printf("Hello %d hack hack hack hack hack %d\n", 1, 4);
-  my_printf("Hello '%s' hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh\n", "hack");
-  my_printf("Hello hhhhhhhhhhhhhh %d sssssssssssssss\n", 1);
-  my_printf("Hello  %u\n", 1);
-  return 0;
-}