From 28fbf9c549fdcd97033fe2f0a9999290dd63ffde Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Tue, 5 Jan 2010 14:25:29 +0800
Subject: [PATCH] Bug#48776 row based replication breaks with spatial /
 geometry types, cause crashes!

This bug is the same problem as Bug 49836 for 5.1 versions.
---
 mysql-test/suite/rpl/r/rpl_geometry.result | 18 +++++++++++++++
 mysql-test/suite/rpl/t/rpl_geometry.test   | 26 ++++++++++++++++++++++
 sql/rpl_utility.h                          |  1 +
 3 files changed, 45 insertions(+)
 create mode 100644 mysql-test/suite/rpl/r/rpl_geometry.result
 create mode 100644 mysql-test/suite/rpl/t/rpl_geometry.test

diff --git a/mysql-test/suite/rpl/r/rpl_geometry.result b/mysql-test/suite/rpl/r/rpl_geometry.result
new file mode 100644
index 00000000000..9b48dba4f22
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_geometry.result
@@ -0,0 +1,18 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+create table t1(a varchar(100),
+b multipoint not null,
+c varchar(256));
+insert into t1 set
+a='hello',
+b=geomfromtext('multipoint(1 1)'),
+c='geometry';
+create table t2 (a int(11) not null auto_increment primary key,
+b geometrycollection default null,
+c decimal(10,0));
+insert into t2(c) values (null);
+drop table t1, t2;
diff --git a/mysql-test/suite/rpl/t/rpl_geometry.test b/mysql-test/suite/rpl/t/rpl_geometry.test
new file mode 100644
index 00000000000..eac98924b98
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_geometry.test
@@ -0,0 +1,26 @@
+source include/master-slave.inc;
+source include/have_binlog_format_row.inc;
+
+#
+# Bug#48776, Bug#43784
+#
+create table t1(a varchar(100),
+       	        b multipoint not null,
+		c varchar(256));
+
+insert into t1 set
+       a='hello',
+       b=geomfromtext('multipoint(1 1)'),
+       c='geometry';
+
+create table t2 (a int(11) not null auto_increment primary key,
+       	     	 b geometrycollection default null,
+		 c decimal(10,0));
+
+insert into t2(c) values (null);
+
+sync_slave_with_master;
+
+connection master;
+drop table t1, t2;
+source include/master-slave-end.inc;
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h
index 1f4ca246ff1..d011e9aade8 100644
--- a/sql/rpl_utility.h
+++ b/sql/rpl_utility.h
@@ -95,6 +95,7 @@ public:
         case MYSQL_TYPE_LONG_BLOB:
         case MYSQL_TYPE_DOUBLE:
         case MYSQL_TYPE_FLOAT:
+        case MYSQL_TYPE_GEOMETRY:
         {
           /*
             These types store a single byte.