Commit fa1dcde8 authored by unknown's avatar unknown

Merge mysql.com:/home/alexi/innodb/mysql-5.0-work

into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.


mysql-test/r/innodb.result:
  Null-merge.
mysql-test/t/innodb.test:
  Null-merge.
storage/innobase/dict/dict0dict.c:
  Null-merge.
storage/innobase/dict/dict0load.c:
  Null-merge.
storage/innobase/dict/dict0mem.c:
  Null-merge.
storage/innobase/ibuf/ibuf0ibuf.c:
  Null-merge.
storage/innobase/include/dict0dict.h:
  Null-merge.
storage/innobase/include/dict0mem.h:
  Null-merge.
storage/innobase/include/univ.i:
  Null-merge.
storage/innobase/log/log0recv.c:
  Null-merge.
storage/innobase/row/row0mysql.c:
  Null-merge.
parents cbdc730a 43690501
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment