diff options
| author | Dmitry Lenev <Dmitry.Lenev@oracle.com> | 2011-02-02 16:53:56 +0300 |
|---|---|---|
| committer | Dmitry Lenev <Dmitry.Lenev@oracle.com> | 2011-02-02 16:53:56 +0300 |
| commit | 3be9d7420e6d678e52fa9a9a8412b20fb8a30c2d (patch) | |
| tree | 4681ffde664b3e72938eee275bfada9a7c1e4bdd /sql/field.cc | |
| parent | d6ed8398d5ce4ef144e2e2f03ffbb1be41cbafe3 (diff) | |
| parent | 3473329d3b5e2fd339c184c2e7c75bb6b3bda3ad (diff) | |
| download | mariadb-git-3be9d7420e6d678e52fa9a9a8412b20fb8a30c2d.tar.gz | |
Merged fix for bug #58650 "Failing assertion:
primary_key_no == -1 || primary_key_no == 0"
into mysql-5.5 tree.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 50db2da97e4..01c4459c06c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9073,6 +9073,7 @@ void Create_field::create_length_to_internal_length(void) case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_BLOB: + case MYSQL_TYPE_GEOMETRY: case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_STRING: case MYSQL_TYPE_VARCHAR: |