*

* NULL MERGE
*

Merge siva.hindu.god:/home/tsmith/m/inno/mar22/50
into  siva.hindu.god:/home/tsmith/m/inno/mar22/51

Null merge of innodb-5.0 snapshots.


mysql-test/r/innodb.result:
  use local (null merge)
mysql-test/t/innodb.test:
  use local (null merge)
storage/innobase/dict/dict0dict.c:
  use local (null merge)
storage/innobase/handler/ha_innodb.cc:
  use local (null merge)
storage/innobase/include/rem0rec.ic:
  use local (null merge)
storage/innobase/include/sync0sync.ic:
  use local (null merge)
storage/innobase/lock/lock0lock.c:
  use local (null merge)
storage/innobase/srv/srv0srv.c:
  use local (null merge)
storage/innobase/ut/ut0ut.c:
  use local (null merge)