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

[Ashish Agarwal]

 3874 Ashish Agarwal	2012-04-18
      wl#2739: Changes in the the test case
               compiling it in windows. 

    modified:
      mysql-test/t/validate_password_plugin.test
      plugin/password_validation/validate_password.cc
 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
=== modified file 'mysql-test/t/validate_password_plugin.test'
--- a/mysql-test/t/validate_password_plugin.test	2012-04-17 12:22:53 +0000
+++ b/mysql-test/t/validate_password_plugin.test	2012-04-18 05:36:33 +0000
@@ -1,19 +1,11 @@
 --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 '';
-
-eval INSTALL PLUGIN validate_password SONAME 'validate_password.$expected_ext';
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN validate_password SONAME '$VALIDATE_PASSWORD';
 --error ER_UDF_EXISTS
-eval INSTALL PLUGIN validate_password SONAME 'validate_password.$expected_ext';
+eval INSTALL PLUGIN validate_password SONAME '$VALIDATE_PASSWORD';
 
 # 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 12:22:53 +0000
+++ b/plugin/password_validation/validate_password.cc	2012-04-18 05:36:33 +0000
@@ -15,10 +15,10 @@
 
 #include <string>
 #include <mysql/plugin_validate_password.h>
-#include <m_ctype.h>
 #include <map>
 #include <mysql/psi/mysql_file.h>
-#include <sql_plugin.h>
+#include "m_ctype.h"
+#include "sql_plugin.h"
 
 #define PASSWORD_STRENGTH_REJECTED     0
 #define PASSWORD_STRENGTH_LOW          1

No bundle (reason: useless for push emails).