database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

small enhancement of the create table options feature:

Browse Source 
no unnecessary casting from void*, more type safety.
typos fixed.
This commit is contained in:
Sergei Golubchik
2011-05-10 18:19:11 +02:00
parent 27fb650b8b
commit e343a2c134
8 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_table.cc
View File

@@ -5855,10 +5855,10 @@ compare_tables(TABLE *table,
DBUG_RETURN(0);
}
if ((create_info->fileds_option_struct=
(void**)thd->calloc(sizeof(void*) * table->s->fields)) == NULL ||
(create_info->indexes_option_struct=
(void**)thd->calloc(sizeof(void*) * table->s->keys)) == NULL)
if ((create_info->fields_option_struct= (ha_field_option_struct**)
thd->calloc(sizeof(void*) * table->s->fields)) == NULL ||
(create_info->indexes_option_struct= (ha_index_option_struct**)
thd->calloc(sizeof(void*) * table->s->keys)) == NULL)
DBUG_RETURN(1);
/*
@@ -5879,7 +5879,7 @@ compare_tables(TABLE *table,
tmp_new_field= tmp_new_field_it++)
{
DBUG_ASSERT(i < table->s->fields);
create_info->fileds_option_struct[i]= tmp_new_field->option_struct;
create_info->fields_option_struct[i]= tmp_new_field->option_struct;
/* Make sure we have at least the default charset in use. */
if (!new_field->charset)