bzr push into mysql-trunk branch (alexander.nozdrin:3085 to 3086)

[Alexander Nozdrin]

 3086 Alexander Nozdrin	2011-05-16 [merge]
      Auto-merge from 5.5.

    modified:
      .bzrignore
      sql/sql_acl.cc
 3085 Vinay Fisrekar	2011-05-14 [merge]
      Merge from mysql-5.5 -> mysql-trunk

    added:
      mysql-test/r/implicit_char_to_num_conversion.result
      mysql-test/t/implicit_char_to_num_conversion.test
=== modified file '.bzrignore'
--- a/.bzrignore	2011-05-11 12:47:11 +0000
+++ b/.bzrignore	2011-05-16 08:52:10 +0000
@@ -3159,3 +3159,4 @@ VERSION.dep
 info_macros.cmake
 Docs/INFO_BIN
 Docs/INFO_SRC
+Testing

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2011-05-10 13:37:37 +0000
+++ b/sql/sql_acl.cc	2011-05-16 08:52:10 +0000
@@ -3645,6 +3645,7 @@ int mysql_table_grant(THD *thd, TABLE_LI
   {						// Should never happen
     /* Restore the state of binlog format */
     DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row());
+    thd->lex->restore_backup_query_tables_list(&backup);
     if (save_binlog_row_based)
       thd->set_current_stmt_binlog_format_row();
     DBUG_RETURN(TRUE);				/* purecov: deadcode */

No bundle (reason: useless for push emails).