diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-03-16 17:20:42 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-03-16 17:20:42 +0100 |
| commit | 26a8eda499beb367d4255e8fbf2155f0b46cd650 (patch) | |
| tree | 568b95738a71cc6d297a52a27bcbd0650c075dd3 /sql | |
| parent | f977e21d26a8a1a66aeb2e15e607676104f25149 (diff) | |
| parent | 71cc817b2931ff1cb19a6d1adcb07b9aad85d8bb (diff) | |
| download | mariadb-git-26a8eda499beb367d4255e8fbf2155f0b46cd650.tar.gz | |
merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index d400e96ce7e..cfb57475b68 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2128,8 +2128,6 @@ static int check_part_field(enum_field_types sql_type, } switch (sql_type) { - case MYSQL_TYPE_NEWDECIMAL: - case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_TINY: case MYSQL_TYPE_SHORT: case MYSQL_TYPE_LONG: @@ -2151,6 +2149,8 @@ static int check_part_field(enum_field_types sql_type, *result_type= STRING_RESULT; *need_cs_check= TRUE; return FALSE; + case MYSQL_TYPE_NEWDECIMAL: + case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_TIMESTAMP: case MYSQL_TYPE_NULL: case MYSQL_TYPE_FLOAT: |