bk commit into 5.1 tree (msvensson:1.2429)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-22 16:58:21+01:00, msvensson@neptunus.(none) +6 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2371.67

  BitKeeper/deleted/.del-CMakeLists.txt~10@stripped, 2007-01-22 16:58:12+01:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.1.2.2

  BitKeeper/deleted/.del-CMakeLists.txt~10@stripped, 2007-01-22 16:58:12+01:00,
msvensson@neptunus.(none) +0 -0
    Merge rename: extra/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~10

  extra/yassl/include/openssl/ssl.h@stripped, 2007-01-22 16:58:12+01:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.14.1.5

  extra/yassl/src/ssl.cpp@stripped, 2007-01-22 16:58:12+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.16.1.7

  mysql-test/mysql-test-run.pl@stripped, 2007-01-22 16:58:12+01:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.30.49.48

  mysql-test/r/mysqltest.result@stripped, 2007-01-22 16:58:12+01:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.24.1.17

  mysql-test/t/mysqltest.test@stripped, 2007-01-22 16:58:12+01:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.24.1.27

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.50/mysql-test/r/mysqltest.result	2007-01-22 16:58:40 +01:00
+++ 1.51/mysql-test/r/mysqltest.result	2007-01-22 16:58:40 +01:00
@@ -269,6 +269,15 @@ mysqltest: At line 1: Missing assignment
 1
 # Execute: echo $success ;
 1 
+# Check if let $B = $A is an assignment per value.
+let $A = initial value of A;
+let $B = initial value of B;
+let $B = $A
+# Content of $A is: initial value of B
+let $A = changed value of A;
+# Content of $B is: initial value of B
+let $B = changed value of B;
+# Content of $A is: changed value of A
 mysqltest: At line 1: Missing required argument 'filename' to command 'source'
 mysqltest: At line 1: Could not open file ./non_existingFile
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source
directives are nesting too deep

--- 1.62/mysql-test/t/mysqltest.test	2007-01-22 16:58:40 +01:00
+++ 1.63/mysql-test/t/mysqltest.test	2007-01-22 16:58:40 +01:00
@@ -688,6 +688,36 @@ echo # <whatever> success: $success ;
 --echo # Execute: echo \$success ;
 echo $success ;
 
+
+# ----------------------------------------------------------------------------
+# Test to assign let from variable
+# let $<var_name>=$<var_name>;
+# ----------------------------------------------------------------------------
+
+--echo # Check if let \$B = \$A is an assignment per value.
+
+# Basic preparations:
+--echo let \$A = initial value of A;
+let $A = initial value of A;
+# --echo # Content of \$A is: $A
+--echo let \$B = initial value of B;
+let $B = initial value of B;
+# --echo # Content of \$B is: $B
+
+# Assign $B to $A:
+--echo let \$B = \$A
+let $A = $B;
+--echo # Content of \$A is: $A
+
+# Changes of $B must NOT affect $A and Changes of $A must NOT affect $B !
+--echo let \$A = changed value of A;
+let $A = changed value of A;
+--echo # Content of \$B is: $B
+
+--echo let \$B = changed value of B;
+let $B = changed value of B;
+--echo # Content of \$A is: $A
+
 # ----------------------------------------------------------------------------
 # Test to assign let from query
 # let $<var_name>=`<query>`;

--- 1.19/extra/yassl/include/openssl/ssl.h	2007-01-22 16:58:40 +01:00
+++ 1.20/extra/yassl/include/openssl/ssl.h	2007-01-22 16:58:40 +01:00
@@ -41,7 +41,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "1.5.0"
+#define YASSL_VERSION "1.5.8"
 
 
 #if defined(__cplusplus)

--- 1.26/extra/yassl/src/ssl.cpp	2007-01-22 16:58:40 +01:00
+++ 1.27/extra/yassl/src/ssl.cpp	2007-01-22 16:58:40 +01:00
@@ -958,7 +958,7 @@ void ERR_print_errors_fp(FILE* /*fp*/)
 
 char* ERR_error_string(unsigned long errNumber, char* buffer)
 {
-  static char* msg = (char*) "Please supply a buffer for error string";
+    static char* msg = "Please supply a buffer for error string";
 
     if (buffer) {
         SetErrorString(YasslError(errNumber), buffer);