diff options
| author | MySQL Build Team <build@mysql.com> | 2009-11-25 17:56:33 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-11-25 17:56:33 +0100 |
| commit | cb115003f4fd271b9924adeaebb3b9fb367d268d (patch) | |
| tree | ef685e056e80855de1817f3100005da13505cddd | |
| parent | d8f41c85933d5c1ebee239ba1c5e2958f626e89f (diff) | |
| download | mariadb-git-cb115003f4fd271b9924adeaebb3b9fb367d268d.tar.gz | |
Backport into build-200911241145-5.1.40sp1
> ------------------------------------------------------------
> revno: 3148.13.3
> revision-id: svoj@sun.com-20091102144140-8de1z6mdy5dopw3j
> parent: svoj@sun.com-20091102143655-lo69f57p82nky58q
> committer: Sergey Vojtovich <svoj@sun.com>
> branch nick: mysql-5.1-bugteam
> timestamp: Mon 2009-11-02 18:41:40 +0400
> message:
> Applying InnoDB snashot 5.1-ss6129
>
> Detailed revision comments:
>
> r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
> branches/5.1: Fix bug #47777. Treat the Geometry data same as
> Binary BLOB in ha_innobase::store_key_val_for_row(), since the
> Geometry data is stored as Binary BLOB in Innodb.
>
> Review: rb://180 approved by Marko Makela.
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index a8b9b678282..698e9ac8e28 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -3240,7 +3240,10 @@ ha_innobase::store_key_val_for_row( } else if (mysql_type == MYSQL_TYPE_TINY_BLOB || mysql_type == MYSQL_TYPE_MEDIUM_BLOB || mysql_type == MYSQL_TYPE_BLOB - || mysql_type == MYSQL_TYPE_LONG_BLOB) { + || mysql_type == MYSQL_TYPE_LONG_BLOB + /* MYSQL_TYPE_GEOMETRY data is treated + as BLOB data in innodb. */ + || mysql_type == MYSQL_TYPE_GEOMETRY) { CHARSET_INFO* cs; ulint key_len; |