diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-24 11:10:56 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-24 11:10:56 +0300 |
| commit | ae715642f46d4ed9ea8b5dd9b5cc9f3cace7f437 (patch) | |
| tree | fade17e9250fa6ba841874e93b0be94d47c62791 /sql/sql_partition.cc | |
| parent | 6be830e14bea8ec7c1707b0c505752bee6587203 (diff) | |
| parent | 36954366317edeb6e8cfbce17b51794d90d79621 (diff) | |
| download | mariadb-git-ae715642f46d4ed9ea8b5dd9b5cc9f3cace7f437.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Diffstat (limited to 'sql/sql_partition.cc')
| -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: |