From ad0f8fd1c95eda2c04003cff3b54efecc7910a15 Mon Sep 17 00:00:00 2001
From: "antony@ppcg5.local" <>
Date: Sun, 29 Apr 2007 08:37:24 -0700
Subject: [PATCH 1/2] fix pedantic compiler build failure - surplus ';'
 character

---
 include/mysql/plugin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 751ce516a39..af8a60361c8 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -657,7 +657,7 @@ char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length,
 
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif

From b9cb8c9db9880689f485d2efbfe38b070aa4ae1c Mon Sep 17 00:00:00 2001
From: "antony@ppcg5.local" <>
Date: Sun, 29 Apr 2007 08:46:34 -0700
Subject: [PATCH 2/2] fix windows build failure   VC++ does not like
 compile_time_assert() macro

---
 sql/sql_lex.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index bd81aa2d5c1..4cb25aca77c 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1772,8 +1772,10 @@ st_lex::st_lex()
   :result(0), yacc_yyss(0), yacc_yyvs(0),
    sql_command(SQLCOM_END)
 {
+#ifndef __WIN__
   /* Check that plugins_static_buffer is declared immediately after plugins */
   compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer);
+#endif
 
   my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
                          plugins_static_buffer,