mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

mysql-5.5.34 merge

Browse source 
(some patches reverted, test case added)
This commit is contained in:
Sergei Golubchik 2013-11-19 13:16:25 +01:00
commit fa3f8a18b2
91 changed files with 951 additions and 632 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/partition_info.cc
View file

@ -2214,11 +2214,10 @@ int partition_info::fix_parser_data(THD *thd)
{
part_elem= it++;
List_iterator<part_elem_value> list_val_it(part_elem->list_val_list);
j= 0;
num_elements= part_elem->list_val_list.elements;
DBUG_ASSERT(part_type == RANGE_PARTITION ?
num_elements == 1U : TRUE);
do
for (j= 0; j < num_elements; j++)
{
part_elem_value *val= list_val_it++;
if (column_list)
@ -2253,7 +2252,7 @@ int partition_info::fix_parser_data(THD *thd)
list_val_it.remove();
}
}
} while (++j < num_elements);
}
} while (++i < num_parts);
DBUG_RETURN(FALSE);
}