Automatic merge with 5.2 to fix compiler failure on FreeBSD

extra/yassl/src/yassl_error.cpp

@@ -128,7 +128,7 @@ void SetErrorString(unsigned long error, char* buffer)
         break;
 
     case badVersion_error :
-        strncpy(buffer, "protocl version mismatch", max);
+        strncpy(buffer, "protocol version mismatch", max);
         break;
         
     case compress_error :

sql/mysqld.cc

@@ -744,9 +744,7 @@ char *opt_logname, *opt_slow_logname;
 /* Static variables */
 
 static bool kill_in_progress, segfaulted;
-#ifdef HAVE_STACKTRACE
 static my_bool opt_stack_trace;
-#endif /* HAVE_STACKTRACE */
 static my_bool opt_bootstrap, opt_myisam_log;
 static int cleanup_done;
 static ulong opt_specialflag, opt_myisam_block_size;