1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge with 5.2 to fix compiler failure on FreeBSD

Browse Source
This commit is contained in:
Michael Widenius 2011-03-04 12:39:27 +02:00
commit e1bb14ea6b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/src/yassl_error.cpp
View File

@ -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 :

2
sql/mysqld.cc
View File

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