bzr push into mysql-5.1 branch (vasil.dimov:3659 to 3660)

[vasil.dimov]

 3660 Vasil Dimov	2011-06-29 [merge]
      Merge mysql-5.0 -> mysql-5.1

    modified:
      extra/innochecksum.c
 3659 Marko Mäkelä	2011-06-29
      Bug #12612184 BLOB debug code cleanup:
      Refactor the !rec_offs_any_extern relaxation in row_build().
      
      trx_assert_active(trx_id): Assert that the given transaction is active.
      (In the 5.1 built-in InnoDB, there is no trx->is_recovered field.)
      
      trx_assert_recovered(trx_id): Assert that the given transaction is
      active and has been recovered after a crash.
      
      row_build(): Replace a bunch of code with an assertion that invokes
      trx_assert_active() or trx_assert_recovered() and row_get_rec_trx_id().
      
      row_get_trx_id_offset(): Make the function inlined. Remove the unused
      parameter rec, and make all parameters const.
      
      row_get_rec_trx_id(), row_get_rec_roll_ptr(): Make all parameters const.
      
      rb:691 approved by Jimmy Yang

    modified:
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/row/row0row.c
      storage/innodb_plugin/include/row0row.h
      storage/innodb_plugin/include/row0row.ic
      storage/innodb_plugin/include/row0upd.ic
      storage/innodb_plugin/include/trx0sys.h
      storage/innodb_plugin/include/trx0sys.ic
      storage/innodb_plugin/row/row0row.c
=== modified file 'extra/innochecksum.c'
--- a/extra/innochecksum.c	revid:marko.makela@stripped0629065715-b4d2feoxu7j88id2
+++ b/extra/innochecksum.c	revid:vasil.dimov@strippedg
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2005 MySQL AB & Innobase Oy
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

No bundle (reason: useless for push emails).