Commit 98db5e57 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-xa 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


sql/ha_innodb.cc:
  Auto merged
parents de1dcee9 2981a284

There are no changes