From 0e43d765573ececac5c0b013235f11aa3c66fbda Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@mysql.com>
Date: Sat, 11 Oct 2008 11:27:41 +0300
Subject: [PATCH] Merged 5.1 maria with 5.1 maria team tree. Automerge.