Null-merge (innodb-4.1-ss14 is not to be applied to

higher versions)


innobase/include/os0file.h:
  Null-merge
innobase/os/os0file.c:
  Null-merge
mysql-test/r/innodb.result:
  Null-merge
mysql-test/t/innodb.test:
  Null-merge
sql/ha_innodb.cc:
  Null-merge
This commit is contained in:
unknown 2006-01-15 16:43:30 +03:00
commit fe1970d4b9

Diff content is not available