bzr commit into mysql-trunk-innodb branch (vasil.dimov:3552)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:marko.makela@stripped

 3552 Vasil Dimov	2011-03-28 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      storage/innobase/trx/trx0i_s.c
=== modified file 'storage/innobase/trx/trx0i_s.c'
--- a/storage/innobase/trx/trx0i_s.c	revid:marko.makela@stripped
+++ b/storage/innobase/trx/trx0i_s.c	revid:vasil.dimov@stripped
@@ -519,7 +519,7 @@ fill_trx_row(
 		query[stmt_len] = '\0';
 
 		row->trx_query = ha_storage_put_memlim(
-			cache->storage, stmt, stmt_len + 1,
+			cache->storage, query, stmt_len + 1,
 			MAX_ALLOWED_FOR_STORAGE(cache));
 
 		row->trx_query_cs = innobase_get_charset(trx->mysql_thd);

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).