List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:March 28 2011 9:17am
Subject:bzr push into mysql-5.5-innodb branch (vasil.dimov:3351 to 3352)
View as plain text  
 3352 Vasil Dimov	2011-03-28 [merge]
      Merge mysql-5.1-innodb -> mysql-5.5-innodb

    modified:
      storage/innobase/trx/trx0i_s.c
 3351 Marko Mäkelä	2011-03-24
      Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() [part 4 of 4]
      
      ibuf_inside(), ibuf_enter(), ibuf_exit(): Add the parameter mtr. The
      flag is no longer kept in the thread-local storage but in the
      mini-transaction (mtr->inside_ibuf).
      
      mtr_start(): Clean up the comment and remove the unused return value.
      mtr_commit(): Assert !ibuf_inside(mtr) in debug builds.
      
      ibuf_mtr_start(): Like mtr_start(), but sets the flag.
      ibuf_mtr_commit(), ibuf_btr_pcur_commit_specify_mtr(): Wrappers that
      assert ibuf_inside().
      
      buf_page_get_zip(), buf_page_init_for_read(),
      buf_read_ibuf_merge_pages(), fil_io(), ibuf_free_excess_pages(),
      ibuf_contract_ext(): Remove assertions on ibuf_inside(), because a
      mini-transaction is not available.
      
      buf_read_ahead_linear(): Add the parameter inside_ibuf.
      
      ibuf_restore_pos(): When this function returns FALSE, it commits mtr
      and must therefore do ibuf_exit(mtr).
      
      ibuf_delete_rec(): This function commits mtr and must therefore do
      ibuf_exit(mtr).
      
      ibuf_rec_get_page_no(), ibuf_rec_get_space(), ibuf_rec_get_info(),
      ibuf_rec_get_op_type(), ibuf_build_entry_from_ibuf_rec(),
      ibuf_rec_get_volume(), ibuf_get_merge_page_nos(),
      ibuf_get_volume_buffered_count(), ibuf_get_entry_counter_low(): Add
      the parameter mtr in debug builds, for asserting ibuf_inside(mtr).
      
      rb:585 approved by Sunny Bains

    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@strippedqxj6lveq
+++ b/storage/innobase/trx/trx0i_s.c	revid:vasil.dimov@stripped
@@ -518,7 +518,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).
Thread
bzr push into mysql-5.5-innodb branch (vasil.dimov:3351 to 3352) vasil.dimov28 Mar