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

[Ashish Agarwal]

 3873 Ashish Agarwal	2012-04-17
      WL#2739: Some tests were failing.
               Unable to compile in windows.
               patch to correct the test cases and
               make it compile in windows.

    modified:
      mysql-test/t/validate_password_plugin.test
      plugin/password_validation/validate_password.cc
      sql/item_strfunc.cc
 3872 Ashish Agarwal	2012-04-17
      WL#2739: Failing test case in WL branch.

    modified:
      include/mysql/plugin.h
      mysql-test/r/validate_password_plugin.result
      mysql-test/t/validate_password_plugin.test
      plugin/password_validation/validate_password.cc
      sql/item_create.cc
      sql/item_strfunc.cc
=== modified file 'mysql-test/t/validate_password_plugin.test'
--- a/mysql-test/t/validate_password_plugin.test	2012-04-17 07:12:21 +0000
+++ b/mysql-test/t/validate_password_plugin.test	2012-04-17 12:22:53 +0000
@@ -1,11 +1,19 @@
 --source include/not_embedded.inc
 --source include/have_validate_password_plugin.inc
 
+# Adjustment to the OS dependent extension of shared libraries.
+let $expected_ext= so;
+if(`SELECT CONVERT(@@version_compile_os USING latin1)
+           IN ("Win32","Win64","Windows")`)
+{
+   let $expected_ext= dll;
+}
+
 CREATE USER 'base_user'@'localhost' IDENTIFIED BY '';
 
-INSTALL PLUGIN validate_password SONAME 'validate_password.so';
+eval INSTALL PLUGIN validate_password SONAME 'validate_password.$expected_ext';
 --error ER_UDF_EXISTS
-INSTALL PLUGIN validate_password SONAME 'validate_password.so';
+eval INSTALL PLUGIN validate_password SONAME 'validate_password.$expected_ext';
 
 # test for all the three password policy
 --echo policy: low= 1, medium= 2, strong= 3

=== modified file 'plugin/password_validation/validate_password.cc'
--- a/plugin/password_validation/validate_password.cc	2012-04-17 07:12:21 +0000
+++ b/plugin/password_validation/validate_password.cc	2012-04-17 12:22:53 +0000
@@ -116,7 +116,7 @@ static int validate_password_init(void *
   uint count= 0;
   char *dictionary_file;
   char default_dictionary_file[FN_REFLEN];
-  fn_format(default_dictionary_file, "dictionary.txt", opt_plugin_dir,
+  fn_format(default_dictionary_file, "dictionary.txt", opt_plugin_dir_ptr,
             "", MYF(0));
   dictionary_file= (validate_password_dictionary_file ?
                     validate_password_dictionary_file :

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2012-04-17 07:12:21 +0000
+++ b/sql/item_strfunc.cc	2012-04-17 12:22:53 +0000
@@ -1923,9 +1923,9 @@ String *Item_func_password::val_str_asci
 {
   DBUG_ASSERT(fixed == 1);
   String *res= args[0]->val_str(str); 
-  check_password_validation(res->ptr());
   if ((null_value=args[0]->null_value))
     return 0;
+  check_password_validation(res->ptr());
   if (res->length() == 0)
     return make_empty_result();
   my_make_scrambled_password(tmp_value, res->ptr(), res->length());

No bundle (reason: useless for push emails).