Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936


include/mysql/plugin.h:
  Auto merged

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,