Changes for --with-server-suffix

Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/log_event.h b/sql/log_event.h
index 5260b71adb7..4dd5e9140f7 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -311,7 +311,7 @@ public:
   void print(FILE* file, bool short_form = 0);
 };
 
-extern char server_version[50];
+extern char server_version[SERVER_VERSION_LENGTH];
 
 class Start_log_event: public Log_event
 {
@@ -333,6 +333,7 @@ public:
       return;				
     binlog_version = uint2korr(buf+4);
     memcpy(server_version, buf + 6, sizeof(server_version));
+    server_version[sizeof(server_version)-1]=0;
     created = uint4korr(buf + 6 + sizeof(server_version));
   }
   Start_log_event(const char* buf);