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

[Ashish Agarwal]

 3894 Ashish Agarwal	2012-05-21
      wl#2739: Auditing Password Security
               Test failure in windows 

    modified:
      include/mysql/plugin_validate_password.h
      mysql-test/t/validate_password_plugin.test
      plugin/password_validation/validate_password.cc
      sql/string_service.cc
 3893 Ashish Agarwal	2012-05-19
      wl2739: Auditing Password Security
              Compilation error in solaris.

    modified:
      plugin/password_validation/validate_password.cc
=== modified file 'include/mysql/plugin_validate_password.h'
--- a/include/mysql/plugin_validate_password.h	2012-05-18 15:35:54 +0000
+++ b/include/mysql/plugin_validate_password.h	2012-05-21 07:37:05 +0000
@@ -26,6 +26,8 @@
   st_mysql_plugin.
 */
 
+typedef void* mysql_string_handle;
+
 struct st_mysql_validate_password
 {
   int interface_version;

=== modified file 'mysql-test/t/validate_password_plugin.test'
--- a/mysql-test/t/validate_password_plugin.test	2012-05-18 15:35:54 +0000
+++ b/mysql-test/t/validate_password_plugin.test	2012-05-21 07:37:05 +0000
@@ -143,8 +143,10 @@ CREATE USER 'user2'@'localhost' IDENTIFI
 UPDATE mysql.user SET PASSWORD= PASSWORD('password') WHERE user='user2';
 UPDATE mysql.user SET PASSWORD= PASSWORD('PA00wrd!#') WHERE user='user2';
 DROP USER 'user2'@'localhost';
-connection default;
+disconnect plug_con;
+--source include/wait_until_disconnected.inc
 
+connection default;
 DROP USER 'base_user'@'localhost';
 DROP USER 'user1'@'localhost';
 UNINSTALL PLUGIN validate_password;

=== modified file 'plugin/password_validation/validate_password.cc'
--- a/plugin/password_validation/validate_password.cc	2012-05-18 19:18:46 +0000
+++ b/plugin/password_validation/validate_password.cc	2012-05-21 07:37:05 +0000
@@ -13,7 +13,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include <my_global.h>
 #include <my_sys.h>
 #include <string>
 #include <mysql/plugin_validate_password.h>
@@ -71,8 +70,10 @@ static void read_dictionary_file()
 {
   string_type words;
   long file_length;
-  std::ifstream dictionary_stream(validate_password_dictionary_file);
 
+  if (validate_password_dictionary_file == NULL)
+    return;
+  std::ifstream dictionary_stream(validate_password_dictionary_file);
   if (!dictionary_stream)
     return;
   dictionary_stream.seekg(0, std::ios::end);

=== modified file 'sql/string_service.cc'
--- a/sql/string_service.cc	2012-05-18 18:18:17 +0000
+++ b/sql/string_service.cc	2012-05-21 07:37:05 +0000
@@ -20,9 +20,8 @@
   functions.
 */
 
-#include <string_service.h>
 #include <my_sys.h>
-
+#include "string_service.h"
 /*  
   This service function converts the mysql_string to the character set
   specified by charset_name parameter.
@@ -64,8 +63,8 @@ mysql_string_iterator_handle mysql_strin
                                                        string_handle)
 {
   String *str= (String *) string_handle;
-  string_iterator *iterator= (string_iterator *)(my_malloc(sizeof
-                                                 (string_iterator *), MYF(0)));
+  string_iterator *iterator= (string_iterator *) my_malloc(sizeof
+                                                 (string_iterator *), MYF(0));
   iterator->iterator_str= str;
   iterator->iterator_ptr= str->ptr();
   iterator->ctype= 0;

No bundle (reason: useless for push emails).