From 679a264357c38f01025e43b9f2a65512eca32839 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.(none)" <>
Date: Fri, 1 Jun 2007 13:33:57 +0400
Subject: [PATCH] A post-merge fix.

---
 sql/sql_table.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index dbcd7cf07c6..bb0f7649272 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -5315,7 +5315,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
 
   if (!create_info->tablespace && create_info->storage_media != HA_SM_MEMORY)
   {
-    char *tablespace= thd->alloc(FN_LEN);
+    char *tablespace= static_cast<char *>(thd->alloc(FN_LEN));
     /*
        Regular alter table of disk stored table (no tablespace/storage change)
        Copy tablespace name