bzr push into mysql-trunk branch (ashish.y.agarwal:3877 to 3878) WL#2739

[Ashish Agarwal]

 3878 Ashish Agarwal	2012-04-24
      wl#2739: Build problem in solaris/windows

    modified:
      include/mysql/plugin_validate_password.h
      plugin/password_validation/validate_password.cc
      sql/sql_plugin.h
 3877 Ashish Agarwal	2012-04-23
      WL#2739: some important changes regarding implementation
               Test fail in windows

    modified:
      include/mysql/plugin_validate_password.h
      mysql-test/r/validate_password_plugin.result
      mysql-test/t/validate_password_plugin.test
      plugin/password_validation/dictionary.txt
      plugin/password_validation/validate_password.cc
      sql/item_strfunc.cc
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_plugin.h
      sql/sql_yacc.yy
=== modified file 'include/mysql/plugin_validate_password.h'
--- a/include/mysql/plugin_validate_password.h	2012-04-23 15:41:09 +0000
+++ b/include/mysql/plugin_validate_password.h	2012-04-24 11:58:02 +0000
@@ -1,3 +1,4 @@
+#ifndef MYSQL_PLUGIN_VALIDATE_PASSWORD_INCLUDED
 /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,6 +17,7 @@
 /*************************************************************************
   API for validate_password plugin. (MYSQL_VALIDATE_PASSWORD_PLUGIN)
 */
+#define MYSQL_PLUGIN_VALIDATE_PASSWORD_INCLUDED
 
 #include <mysql/plugin.h>
 
@@ -41,3 +43,4 @@ struct st_mysql_validate_password
   */
   uint (*validate_password_strength)(const char *password);
 };
+#endif

=== modified file 'plugin/password_validation/validate_password.cc'
--- a/plugin/password_validation/validate_password.cc	2012-04-23 15:41:09 +0000
+++ b/plugin/password_validation/validate_password.cc	2012-04-24 11:58:02 +0000
@@ -13,19 +13,18 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include <m_ctype.h>
 #include <string>
 #include <mysql/plugin_validate_password.h>
 #include <set>
 #include <iostream>
 #include <fstream>
-#include <mysql/psi/mysql_file.h>
-#include <m_ctype.h>
 #include "sql_plugin.h"
 
 #define MAX_DICTIONARY_FILE_LENGTH 1024 * 1024
 #define MIN_DICTIONARY_WORD_LENGTH 3
 
-MYSQL_PLUGIN_EXPORT char opt_plugin_dir[FN_REFLEN];
+MYSQL_PLUGIN_IMPORT char opt_plugin_dir[FN_REFLEN];
 
 enum PASSWORD_POLICY { PASSWORD_STRENGTH_REJECTED, PASSWORD_STRENGTH_LOW,
                        PASSWORD_STRENGTH_MEDIUM, PASSWORD_STRENGTH_STRONG };

=== modified file 'sql/sql_plugin.h'
--- a/sql/sql_plugin.h	2012-04-23 15:41:09 +0000
+++ b/sql/sql_plugin.h	2012-04-24 11:58:02 +0000
@@ -136,10 +136,8 @@ typedef int (*plugin_type_init)(struct s
 
 extern I_List<i_string> *opt_plugin_load_list_ptr;
 extern char *opt_plugin_dir_ptr;
-extern char opt_plugin_dir[FN_REFLEN];
 extern MYSQL_PLUGIN_EXPORT char opt_plugin_dir[FN_REFLEN];
 extern const LEX_STRING plugin_type_names[];
-
 extern int plugin_init(int *argc, char **argv, int init_flags);
 extern void plugin_shutdown(void);
 void add_plugin_options(std::vector<my_option> *options, MEM_ROOT *mem_root);

No bundle (reason: useless for push emails).