merge with mysql-5.5.30 minus few incorrect or not applicable changesets

1 files changed, 5 insertions, 5 deletions

diff --git a/mysql-test/t/bug13633383.test b/mysql-test/t/bug13633383.test
index 72eb2f81c98..e31d4a8c9f6 100644
--- a/mysql-test/t/bug13633383.test
+++ b/mysql-test/t/bug13633383.test
@@ -5,19 +5,19 @@
 CREATE TABLE t1 (
   `a` int(11) DEFAULT NULL,
   `col432` bit(8) DEFAULT NULL,
-  `col433` multipoint DEFAULT NULL,
-  `col434` polygon DEFAULT NULL,
+  `col433` geometry DEFAULT NULL,
+  `col434` geometry DEFAULT NULL,
   `col435` decimal(50,17) unsigned DEFAULT NULL,
   `col436` geometry NOT NULL,
   `col437` tinyblob NOT NULL,
-  `col438` multipolygon DEFAULT NULL,
+  `col438` geometry DEFAULT NULL,
   `col439` mediumblob NOT NULL,
   `col440` tinyblob NOT NULL,
   `col441` double unsigned DEFAULT NULL
 );
 
 CREATE TABLE t2 (
-  `a` multipoint DEFAULT NULL,
+  `a` geometry DEFAULT NULL,
   `col460` date DEFAULT NULL,
   `col461` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `col462` date NOT NULL,
@@ -34,7 +34,7 @@ CREATE TABLE t3 (
   `col579` bit(38) NOT NULL,
   `col580` varchar(93) NOT NULL,
   `col581` datetime DEFAULT NULL,
-  `col583` multipolygon DEFAULT NULL,
+  `col583` geometry DEFAULT NULL,
   `col584` bit(47) NOT NULL
 );