bzr push into mysql-trunk branch (tatjana.nuernberg:3269 to 3270) WL#5706

[Tatjana Azundris Nuernberg]

 3270 Tatjana Azundris Nuernberg	2011-08-18
      WL#5706 robustness in recursions
     @ sql/sql_rewrite.cc
        robustness in recursions

    modified:
      sql/sql_rewrite.cc
 3269 Tatjana Azundris Nuernberg	2011-08-18
      post-pushbuild fixes for WL#5706
     @ mysql-test/r/rewrite.result
        be nicer to embedded.
     @ mysql-test/t/rewrite.test
        be nicer to embedded.
     @ sql/sql_acl.cc
        make helper functions available to sql_rewrite.cc even with
        NO_EMBEDDED_ACCESS_CHECK
     @ sql/sql_parse.cc
        unbreak a corner case with slow query logging and prepared
        statements when needing to log a slow query immediately after
        a rewritten one
     @ sql/sql_rewrite.cc
        rewriting: now also available in embedded, even when access
        checks are off. we might need this later.

    modified:
      mysql-test/r/rewrite.result
      mysql-test/t/rewrite.test
      sql/sql_acl.cc
      sql/sql_parse.cc
      sql/sql_rewrite.cc
=== modified file 'sql/sql_rewrite.cc'
--- a/sql/sql_rewrite.cc	2011-08-18 13:53:05 +0000
+++ b/sql/sql_rewrite.cc	2011-08-18 15:27:05 +0000
@@ -362,6 +362,8 @@ void mysql_rewrite_query(THD *thd)
 {
   String *rlb= &thd->rewritten_query;
 
+  rlb->free();
+
   switch(thd->lex->sql_command)
   {
   case SQLCOM_GRANT:         mysql_rewrite_grant(thd, rlb);         break;

No bundle (reason: useless for push emails).