-
Committer:
Lee Bieber
-
Date:
2010-11-05 20:22:41 UTC
-
mfrom:
(1907.1.2 build)
-
Revision ID:
kalebral@gmail.com-20101105202241-1fm31t0y0fvdwcd3
Merge Brian - Adding FileSort class, merge in catalog tree
Merge Joe - fix bug 670971: InnoDB does not complete shutdown with transaction log enabled