bzr push into mysql-trunk branch (marc.alff:3280 to 3281)

[Marc Alff]

 3281 Marc Alff	2011-08-19
      Fixed windows build break (tentative)

    modified:
      extra/yassl/src/yassl_int.cpp
 3280 Jimmy Yang	2011-08-19
      Fix a merge issue when merge #11830883 from mysql-5.5 to mysql-trunk.
      An added "continue" case in a previously "for" loop needs to be handled
      as well. Such case is missing in mysql-5.5 thus the merge issue.

    modified:
      storage/innobase/row/row0umod.c
=== modified file 'extra/yassl/src/yassl_int.cpp'
--- a/extra/yassl/src/yassl_int.cpp	2011-07-22 14:32:09 +0000
+++ b/extra/yassl/src/yassl_int.cpp	2011-08-19 15:48:04 +0000
@@ -1810,7 +1810,7 @@ extern "C" char *yassl_mysql_strdup(cons
 
 static int
 default_password_callback(char * buffer, int size_arg, int rwflag,
-                          void * callback_data __attribute__((unused)))
+                          void * /* unused: callback_data */)
 {
   char *passwd;
   size_t passwd_len, size= (size_t) size_arg;

No bundle (reason: useless for push emails).