bzr push into mysql-6.0-bugteam branch (kgeorge:2769 to 2770)

[Georgi Kodinov]

 2770 Georgi Kodinov	2008-12-02 [merge]
      merged 5.1-bugteam -> 6.0-bugteam
modified:
  extra/yassl/src/yassl_imp.cpp
  sql/set_var.h

 2769 Davi Arnaut	2008-12-01
      Update perror-win.result file.
modified:
  mysql-test/r/perror-win.result

=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- a/extra/yassl/src/yassl_imp.cpp	2008-11-18 21:17:04 +0000
+++ b/extra/yassl/src/yassl_imp.cpp	2008-12-02 11:25:43 +0000
@@ -1560,6 +1560,7 @@ void ClientHello::Process(input_buffer&,
         return;
     }
     ssl.matchSuite(cipher_suites_, suite_len_);
+    if (ssl.GetError()) return;
     ssl.set_pending(ssl.getSecurity().get_parms().suite_[1]);
 
     if (compression_methods_ == zlib)

=== modified file 'sql/set_var.h'
--- a/sql/set_var.h	2008-11-28 16:30:27 +0000
+++ b/sql/set_var.h	2008-12-02 11:25:43 +0000
@@ -82,6 +82,7 @@ public:
   sys_var(const char *name_arg, sys_after_update_func func= NULL,
           Binlog_status_enum binlog_status_arg= NOT_IN_BINLOG)
     :name(name_arg), after_update(func), no_support_one_shot(1),
+    is_os_charset (FALSE),
     binlog_status(binlog_status_arg),
     m_allow_empty_value(TRUE)
   {}