summaryrefslogtreecommitdiff
path: root/sql/rpl_utility.cc
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2009-12-24 01:07:35 +0000
committerLuis Soares <luis.soares@sun.com>2009-12-24 01:07:35 +0000
commitdcf8e115369c4e97ae092d091365ee07e2f819ed (patch)
treed9feb8cda6dbcb666d91d58206d5b0e334a7e32a /sql/rpl_utility.cc
parent3543244a12a6cd7688923f6c7b61ca548826a0e4 (diff)
downloadmariadb-git-dcf8e115369c4e97ae092d091365ee07e2f819ed.tar.gz
BUG#49836: Replication of geometric fields is broken after WL#5151
Metadata for geometric fields was not being properly stored by the slave in its the table definition. This happened because MYSQL_TYPE_GEOMETRY was not included in the 'switch... case' that handles field metadata according to the field type. Therefore, it would default to 0, leading to always have a mismatch between master's field and slave fields'. We fix this by deploying the missing 'case MYSQL_TYPE_GEOMETRY:'. mysql-test/extra/rpl_tests/type_conversions.test: Added some tests for blob fields and also the particular case for replicating from/into BLOB into/from GEOMETRY. sql/field.h: As requested by Mats, reverted function added by him in changeset: http://lists.mysql.com/commits/95313
Diffstat (limited to 'sql/rpl_utility.cc')
-rw-r--r--sql/rpl_utility.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index e8e22216b38..1971077ab65 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -977,6 +977,7 @@ table_def::table_def(unsigned char *types, ulong size,
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_DOUBLE:
case MYSQL_TYPE_FLOAT:
+ case MYSQL_TYPE_GEOMETRY:
{
/*
These types store a single byte.