bzr push into mysql-5.5 branch (jon.hauglid:3461 to 3462)

[Jon Olav Hauglid]

 3462 Jon Olav Hauglid	2011-06-17 [merge]
      Merge from mysql-5.1 to mysql-5.5

    modified:
      extra/yassl/src/yassl_error.cpp
 3461 Dmitry Lenev	2011-06-17 [merge]
      Merged fix for bug #12652385 - "61493: REORDERING COLUMNS
      TO POSITION FIRST CAN CAUSE DATA TO BE CORRUPTED" into
      mysql-5.5 tree.

    modified:
      mysql-test/r/alter_table.result
      mysql-test/t/alter_table.test
      sql/sql_table.cc
=== modified file 'extra/yassl/src/yassl_error.cpp'
--- a/extra/yassl/src/yassl_error.cpp	2010-02-22 13:23:47 +0000
+++ b/extra/yassl/src/yassl_error.cpp	2011-06-17 07:51:34 +0000
@@ -128,7 +128,7 @@ void SetErrorString(unsigned long error,
         break;
 
     case badVersion_error :
-        strncpy(buffer, "protocl version mismatch", max);
+        strncpy(buffer, "protocol version mismatch", max);
         break;
         
     case compress_error :

No bundle (reason: useless for push emails).