bzr push into mysql-trunk-innodb branch (vasil.dimov:3551 to 3552)

[vasil.dimov]

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

    modified:
      storage/innobase/trx/trx0i_s.c
 3551 Marko Mäkelä	2011-03-24 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    removed:
      storage/innobase/include/thr0loc.h
      storage/innobase/include/thr0loc.ic
      storage/innobase/thr/
      storage/innobase/thr/thr0loc.c
    modified:
      storage/innobase/CMakeLists.txt
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/buf0rea.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/ibuf0ibuf.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/srv/srv0srv.c
      storage/innobase/srv/srv0start.c
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/trx/trx0i_s.c'
--- a/storage/innobase/trx/trx0i_s.c	revid:marko.makela@strippedom-20110324122408-4pq4x1ll6iatqyyn
+++ b/storage/innobase/trx/trx0i_s.c	revid:vasil.dimov@stripped8-szb1uh03isp9fhxv
@@ -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: useless for push emails).