merge 5.2

mysys/my_gethwaddr.c

@@ -151,7 +151,10 @@ my_bool my_gethwaddr(uchar *to)
   {
     if (info->Type == MIB_IF_TYPE_ETHERNET &&
         info->AddressLength == ETHER_ADDR_LEN)
+    {
       res= memcpy_and_test(to, info->Address, ETHER_ADDR_LEN);
+    }
+    info = info->Next;
   }
 
 err:

mysys/my_getopt.c

@@ -396,10 +396,12 @@ int handle_options(int *argc, char ***argv,
 	      */
 	    (*argc)--;
 	    if (!optend || *optend == '1' ||
-		!my_strcasecmp(&my_charset_latin1, optend, "true"))
+		!my_strcasecmp(&my_charset_latin1, optend, "true") ||
+		!my_strcasecmp(&my_charset_latin1, optend, "on"))
 	      *((my_bool*) value)= (my_bool) 1;
 	    else if (*optend == '0' ||
-		     !my_strcasecmp(&my_charset_latin1, optend, "false"))
+		     !my_strcasecmp(&my_charset_latin1, optend, "false") ||
+                     !my_strcasecmp(&my_charset_latin1, optend, "off"))
 	      *((my_bool*) value)= (my_bool) 0;
 	    else
 	    {

plugin/feedback/url_http.cc

@@ -198,7 +198,7 @@ int Url_http::send(const char* data, size_t data_length)
   }
 
 #ifdef HAVE_OPENSSL
-  struct st_VioSSLFd *ssl_fd;
+  struct st_VioSSLFd *UNINIT_VAR(ssl_fd);
   if (ssl)
   {
     buf[0]= 0;

sql/mysqld.cc

@@ -6439,8 +6439,8 @@ struct my_option my_long_options[] =
    &opt_debugging, &opt_debugging,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"general_log", OPT_GENERAL_LOG,
-   "Enable/disable general log.  Filename can be specified with --general-log-file or --log-basename.  Is 'hostname.err' by default.",
-   &opt_log, &opt_log, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
+   "Enable/disable general log.  Filename can be specified with --general-log-file or --log-basename.  Is 'hostname.log' by default.",
+   &opt_log, &opt_log, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_LARGE_PAGES
   {"large-pages", OPT_ENABLE_LARGE_PAGES, "Enable support for large pages. "
    "Disable with --skip-large-pages.", &opt_large_pages, &opt_large_pages,