Commit 1776f2b8 authored by Sergei Golubchik's avatar Sergei Golubchik

compilation failures caused by adding new row format to Aria

parent eec32a33
...@@ -993,9 +993,6 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend) ...@@ -993,9 +993,6 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend)
if (killed_ptr(param)) if (killed_ptr(param))
goto err2; goto err2;
switch (info->s->data_file_type) { switch (info->s->data_file_type) {
case BLOCK_RECORD:
DBUG_ASSERT(0); /* Impossible */
break;
case STATIC_RECORD: case STATIC_RECORD:
if (my_b_read(&param->read_cache,(uchar*) record, if (my_b_read(&param->read_cache,(uchar*) record,
info->s->base.pack_reclength)) info->s->base.pack_reclength))
...@@ -1213,6 +1210,9 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend) ...@@ -1213,6 +1210,9 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend)
link_used+= (block_info.filepos - start_recpos); link_used+= (block_info.filepos - start_recpos);
used+= (pos-start_recpos); used+= (pos-start_recpos);
break; break;
default:
DBUG_ASSERT(0); /* Impossible */
break;
} /* switch */ } /* switch */
if (! got_error) if (! got_error)
{ {
...@@ -3270,9 +3270,6 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param) ...@@ -3270,9 +3270,6 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
DBUG_RETURN(1); DBUG_RETURN(1);
switch (share->data_file_type) { switch (share->data_file_type) {
case BLOCK_RECORD:
DBUG_ASSERT(0); /* Impossible */
break;
case STATIC_RECORD: case STATIC_RECORD:
for (;;) for (;;)
{ {
...@@ -3666,6 +3663,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param) ...@@ -3666,6 +3663,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
record)); record));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
default:
DBUG_ASSERT(0); /* Impossible */
break;
} }
DBUG_RETURN(1); /* Impossible */ DBUG_RETURN(1); /* Impossible */
} }
...@@ -3702,9 +3702,6 @@ int sort_write_record(MI_SORT_PARAM *sort_param) ...@@ -3702,9 +3702,6 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
if (sort_param->fix_datafile) if (sort_param->fix_datafile)
{ {
switch (sort_info->new_data_file_type) { switch (sort_info->new_data_file_type) {
case BLOCK_RECORD:
DBUG_ASSERT(0); /* Impossible */
break;
case STATIC_RECORD: case STATIC_RECORD:
if (my_b_write(&info->rec_cache,sort_param->record, if (my_b_write(&info->rec_cache,sort_param->record,
share->base.pack_reclength)) share->base.pack_reclength))
...@@ -3778,6 +3775,9 @@ int sort_write_record(MI_SORT_PARAM *sort_param) ...@@ -3778,6 +3775,9 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
sort_param->filepos+=reclength+length; sort_param->filepos+=reclength+length;
info->s->state.split++; info->s->state.split++;
break; break;
default:
DBUG_ASSERT(0); /* Impossible */
break;
} }
} }
if (sort_param->master) if (sort_param->master)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment