merge bug 26461 to 5.1-opt

This commit is contained in:
unknown 2008-03-23 14:29:35 +02:00
commit 7bcbc7f2d5
3 changed files with 4 additions and 4 deletions

View file

@ -42,7 +42,7 @@ static int copy_data_between_tables(TABLE *from,TABLE *to,
static bool prepare_blob_field(THD *thd, Create_field *sql_field);
static bool check_engine(THD *, const char *, HA_CREATE_INFO *);
static bool
static int
mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
Alter_info *alter_info,
bool tmp_table,
@ -2173,7 +2173,7 @@ int prepare_create_field(Create_field *sql_field,
TRUE error
*/
static bool
static int
mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
Alter_info *alter_info,
bool tmp_table,