Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge

14 files changed, 385 insertions, 0 deletions

diff --git a/mysql-test/r/ndb_restore_different_endian_data.result b/mysql-test/r/ndb_restore_different_endian_data.result
new file mode 100644
index 00000000000..e1efefb751a
--- /dev/null
+++ b/mysql-test/r/ndb_restore_different_endian_data.result
@@ -0,0 +1,200 @@
+USE test;
+DROP TABLE IF EXISTS t_num,t_datetime,t_string_1,t_string_2,t_gis;
+SHOW TABLES;
+Tables_in_test
+t_gis
+t_string_1
+t_num
+t_string_2
+t_datetime
+SHOW CREATE TABLE t_num;
+Table	Create Table
+t_num	CREATE TABLE `t_num` (
+  `t_pk` int(11) NOT NULL,
+  `t_bit` bit(64) default NULL,
+  `t_tinyint` tinyint(4) default NULL,
+  `t_bool` tinyint(1) default NULL,
+  `t_smallint` smallint(6) default NULL,
+  `t_mediumint` mediumint(9) default NULL,
+  `t_int` int(11) default NULL,
+  `t_bigint` bigint(20) default NULL,
+  `t_float` float default NULL,
+  `t_double` double default NULL,
+  `t_decimal` decimal(37,16) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_datetime;
+Table	Create Table
+t_datetime	CREATE TABLE `t_datetime` (
+  `t_pk` int(11) NOT NULL,
+  `t_date` date default NULL,
+  `t_datetime` datetime default NULL,
+  `t_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `t_time` time default NULL,
+  `t_year` year(4) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_string_1;
+Table	Create Table
+t_string_1	CREATE TABLE `t_string_1` (
+  `t_pk` int(11) NOT NULL,
+  `t_char` char(255) default NULL,
+  `t_varchar` varchar(655) default NULL,
+  `t_binary` binary(255) default NULL,
+  `t_varbinary` varbinary(6553) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_string_2;
+Table	Create Table
+t_string_2	CREATE TABLE `t_string_2` (
+  `t_pk` int(11) NOT NULL,
+  `t_tinyblob` tinyblob,
+  `t_tinytext` tinytext,
+  `t_blob` blob,
+  `t_text` text,
+  `t_mediumblob` mediumblob,
+  `t_mediumtext` mediumtext,
+  `t_longblob` longblob,
+  `t_longtext` longtext,
+  `t_enum` enum('001001','001004','001010','001018','001019','001020','001021','001027','001028','001029','001030','001031','001100','002003','002004','002005','002007') NOT NULL default '001001',
+  `t_set` set('a','B') default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_gis;
+Table	Create Table
+t_gis	CREATE TABLE `t_gis` (
+  `t_pk` int(11) NOT NULL,
+  `t_point` point default NULL,
+  `t_linestring` linestring default NULL,
+  `t_polygon` polygon default NULL,
+  `t_multipoint` multipoint default NULL,
+  `t_multilinestring` multilinestring default NULL,
+  `t_multipolygon` multipolygon default NULL,
+  `t_geometrycollection` geometrycollection default NULL,
+  `t_geometry` geometry default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SELECT * FROM t_datetime;
+t_pk	t_date	t_datetime	t_timestamp	t_time	t_year
+1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
+SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
+t_pk	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
+1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
+t_pk	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
+1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100
+SELECT * FROM t_string_2;
+t_pk	t_tinyblob	t_tinytext	t_blob	t_text	t_mediumblob	t_mediumtext	t_longblob	t_longtext	t_enum	t_set
+1	abcdefghijklmnabcdefghijklmn	abcdefghijklmnabcdefghijklmn	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	001001	a
+SELECT AsText(t_point), AsText(t_linestring),AsText(t_polygon) FROM t_gis ORDER by t_pk;
+AsText(t_point)	AsText(t_linestring)	AsText(t_polygon)
+POINT(10 10)	LINESTRING(10 10,20 10,20 20,10 20,10 10)	POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10))
+POINT(10 20)	LINESTRING(10 10,40 10)	POLYGON((0 0,30 0,30 30,0 0))
+SELECT AsText(t_multipoint), AsText(t_multilinestring),AsText(t_multipolygon) FROM t_gis ORDER by t_pk;
+AsText(t_multipoint)	AsText(t_multilinestring)	AsText(t_multipolygon)
+MULTIPOINT(1 1,11 11,11 21,21 21)	MULTILINESTRING((10 48,10 21,10 0))	MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
+MULTIPOINT(3 6,4 10)	MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7))	MULTIPOLYGON(((0 3,3 3,3 0,0 3)))
+SELECT AsText(t_geometrycollection), AsText(t_geometry) FROM t_gis ORDER by t_pk;
+AsText(t_geometrycollection)	AsText(t_geometry)
+GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10))	MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
+GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))	GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))
+DROP TABLE t_num,t_datetime,t_string_1,t_string_2,t_gis;
+SHOW TABLES;
+Tables_in_test
+t_gis
+t_string_1
+t_num
+t_string_2
+t_datetime
+SHOW CREATE TABLE t_num;
+Table	Create Table
+t_num	CREATE TABLE `t_num` (
+  `t_pk` int(11) NOT NULL,
+  `t_bit` bit(64) default NULL,
+  `t_tinyint` tinyint(4) default NULL,
+  `t_bool` tinyint(1) default NULL,
+  `t_smallint` smallint(6) default NULL,
+  `t_mediumint` mediumint(9) default NULL,
+  `t_int` int(11) default NULL,
+  `t_bigint` bigint(20) default NULL,
+  `t_float` float default NULL,
+  `t_double` double default NULL,
+  `t_decimal` decimal(37,16) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_datetime;
+Table	Create Table
+t_datetime	CREATE TABLE `t_datetime` (
+  `t_pk` int(11) NOT NULL,
+  `t_date` date default NULL,
+  `t_datetime` datetime default NULL,
+  `t_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `t_time` time default NULL,
+  `t_year` year(4) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_string_1;
+Table	Create Table
+t_string_1	CREATE TABLE `t_string_1` (
+  `t_pk` int(11) NOT NULL,
+  `t_char` char(255) default NULL,
+  `t_varchar` varchar(655) default NULL,
+  `t_binary` binary(255) default NULL,
+  `t_varbinary` varbinary(6553) default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_string_2;
+Table	Create Table
+t_string_2	CREATE TABLE `t_string_2` (
+  `t_pk` int(11) NOT NULL,
+  `t_tinyblob` tinyblob,
+  `t_tinytext` tinytext,
+  `t_blob` blob,
+  `t_text` text,
+  `t_mediumblob` mediumblob,
+  `t_mediumtext` mediumtext,
+  `t_longblob` longblob,
+  `t_longtext` longtext,
+  `t_enum` enum('001001','001004','001010','001018','001019','001020','001021','001027','001028','001029','001030','001031','001100','002003','002004','002005','002007') NOT NULL default '001001',
+  `t_set` set('a','B') default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SHOW CREATE TABLE t_gis;
+Table	Create Table
+t_gis	CREATE TABLE `t_gis` (
+  `t_pk` int(11) NOT NULL,
+  `t_point` point default NULL,
+  `t_linestring` linestring default NULL,
+  `t_polygon` polygon default NULL,
+  `t_multipoint` multipoint default NULL,
+  `t_multilinestring` multilinestring default NULL,
+  `t_multipolygon` multipolygon default NULL,
+  `t_geometrycollection` geometrycollection default NULL,
+  `t_geometry` geometry default NULL,
+  PRIMARY KEY  (`t_pk`)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1
+SELECT * FROM t_datetime;
+t_pk	t_date	t_datetime	t_timestamp	t_time	t_year
+1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
+SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
+t_pk	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
+1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
+t_pk	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
+1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100
+SELECT * FROM t_string_2;
+t_pk	t_tinyblob	t_tinytext	t_blob	t_text	t_mediumblob	t_mediumtext	t_longblob	t_longtext	t_enum	t_set
+1	abcdefghijklmnabcdefghijklmn	abcdefghijklmnabcdefghijklmn	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	a123456789b123456789c123456789d123456789e123456789f123456789g123456789	001001	a
+SELECT AsText(t_point), AsText(t_linestring),AsText(t_polygon) FROM t_gis ORDER by t_pk;
+AsText(t_point)	AsText(t_linestring)	AsText(t_polygon)
+POINT(10 10)	LINESTRING(10 10,20 10,20 20,10 20,10 10)	POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10))
+POINT(10 20)	LINESTRING(10 10,40 10)	POLYGON((0 0,30 0,30 30,0 0))
+SELECT AsText(t_multipoint), AsText(t_multilinestring),AsText(t_multipolygon) FROM t_gis ORDER by t_pk;
+AsText(t_multipoint)	AsText(t_multilinestring)	AsText(t_multipolygon)
+MULTIPOINT(1 1,11 11,11 21,21 21)	MULTILINESTRING((10 48,10 21,10 0))	MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
+MULTIPOINT(3 6,4 10)	MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7))	MULTIPOLYGON(((0 3,3 3,3 0,0 3)))
+SELECT AsText(t_geometrycollection), AsText(t_geometry) FROM t_gis ORDER by t_pk;
+AsText(t_geometrycollection)	AsText(t_geometry)
+GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10))	MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
+GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))	GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))
+DROP TABLE t_num,t_datetime,t_string_1,t_string_2,t_gis;
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
new file mode 100644
index 00000000000..90a8443cf45
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
new file mode 100644
index 00000000000..763333c9b1a
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
new file mode 100644
index 00000000000..8849978e293
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
new file mode 100644
index 00000000000..780753239e1
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
new file mode 100644
index 00000000000..8849978e293
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
diff --git a/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
new file mode 100644
index 00000000000..780753239e1
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
new file mode 100644
index 00000000000..157c28b67b3
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
new file mode 100644
index 00000000000..e7602c89db7
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
new file mode 100644
index 00000000000..e2b8f4977ed
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
new file mode 100644
index 00000000000..c8037dd453a
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
new file mode 100644
index 00000000000..e2b8f4977ed
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
diff --git a/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
new file mode 100644
index 00000000000..c8037dd453a
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
diff --git a/mysql-test/t/ndb_restore_different_endian_data.test b/mysql-test/t/ndb_restore_different_endian_data.test
new file mode 100644
index 00000000000..208ab8b459d
--- /dev/null
+++ b/mysql-test/t/ndb_restore_different_endian_data.test
@@ -0,0 +1,185 @@
+-- source include/have_ndb.inc
+-- source include/ndb_default_cluster.inc
+-- source include/not_embedded.inc
+
+#
+# Bug #27543 restore of backup from different endian does not work for blob column
+# Bug #30024 restore of backup from different endian does not work for datetime column
+# Bug #28674 backup will run forever if disk full and later write succes will kill ndb node
+#
+# The table structure and data list below
+#
+# CREATE TABLE  t_num (
+#   t_pk		INT PRIMARY KEY,
+#   t_bit		BIT(64), 
+#   t_tinyint	TINYINT, 
+#   t_bool	BOOL, 
+#   t_smallint	SMALLINT,
+#   t_mediumint	MEDIUMINT,
+#   t_int		INT,
+#   t_bigint	BIGINT,
+#   t_float	FLOAT,
+#   t_double	DOUBLE,
+#   t_decimal	DECIMAL (37, 16)
+# ) ENGINE=NDBCLUSTER;
+# 
+# INSERT INTO t_num VALUE (
+#   1,
+#   b'1010101010101010101010101010101010101010101010101010101010101010',
+#   125,
+#   1,
+#   32765,
+#   8388606,
+#   2147483647,
+#   9223372036854775807,
+#   1e+20,
+#   1e+150,
+#   '331.0000000000'
+# );
+# 
+# CREATE TABLE  t_datetime (
+#   t_pk		INT PRIMARY KEY,
+#   t_date	DATE,
+#   t_datetime	DATETIME,
+#   t_timestamp	TIMESTAMP,
+#   t_time	TIME,
+#   t_year	YEAR
+# ) ENGINE=NDBCLUSTER;
+#   
+# INSERT INTO t_datetime VALUE (
+#   1,
+#   '1998-01-01',
+#   '2006-08-10 10:11:12',
+#   20021029165106,
+#   '19:38:34',
+#   2155
+# );
+# 
+# CREATE TABLE  t_string_1 (
+#   t_pk		INT PRIMARY KEY,
+#   t_char	CHAR(255),
+#   t_varchar	VARCHAR(655),
+#   t_binary	BINARY(255),
+#   t_varbinary	VARBINARY(6553)
+# ) ENGINE=NDBCLUSTER;
+# 
+# CREATE TABLE  t_string_2 (
+#   t_pk		INT PRIMARY KEY,
+#   t_tinyblob	TINYBLOB,
+#   t_tinytext	TINYTEXT,
+#   t_blob	BLOB,
+#   t_text	TEXT,
+#   t_mediumblob	MEDIUMBLOB,
+#   t_mediumtext	MEDIUMTEXT,
+#   t_longblob	LONGBLOB,
+#   t_longtext	LONGTEXT,
+#   t_enum	ENUM('001001','001004','001010','001018','001019','001020','001021','001027','001028','001029','001030','001031','001100','002003','002004','002005','002007')DEFAULT '001001' NOT NULL,
+#   t_set		SET('a','B')
+# ) ENGINE=NDBCLUSTER;
+# 
+# INSERT INTO t_string_1 VALUE (
+#   1,
+#   'abcdefghijklmn',
+#   'abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn',
+#   0x612020,
+#   0x4100
+# );
+# 
+# INSERT INTO t_string_2 VALUE (
+#   1,
+#   'abcdefghijklmnabcdefghijklmn',
+#   'abcdefghijklmnabcdefghijklmn',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   'a123456789b123456789c123456789d123456789e123456789f123456789g123456789',
+#   '001001',
+#   'a'
+# ); 
+#  
+# CREATE TABLE t_gis (
+#   t_pk			INT PRIMARY KEY,
+#   t_point		POINT,
+#   t_linestring		LINESTRING,
+#   t_polygon		POLYGON,
+#   t_multipoint		MULTIPOINT,
+#   t_multilinestring	MULTILINESTRING,
+#   t_multipolygon	MULTIPOLYGON,
+#   t_geometrycollection	GEOMETRYCOLLECTION,
+#   t_geometry		GEOMETRY
+# ) ENGINE=NDBCLUSTER;
+# 
+# INSERT INTO t_gis VALUE (
+#   1,
+#   PointFromText('POINT(10 10)'),
+#   LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)'),
+#   PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))'),
+#   MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)'),
+#   MLineFromText('MULTILINESTRING((10 48,10 21,10 0))'),
+#   MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))'),
+#   GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))'),
+#   MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')
+# );
+# 
+# INSERT INTO t_gis VALUE (
+#   2,
+#   PointFromWKB(AsWKB(PointFromText('POINT(10 20)'))),
+#   LineStringFromWKB(LineString(Point(10, 10), Point(40, 10))),
+#   PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))),
+#   MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10))),
+#   MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))),
+#   MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))),
+#   GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))),
+#   GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9))))
+# );
+
+
+
+#
+# Restore backup files (from little endian)
+#
+
+--disable_warnings
+USE test;
+DROP TABLE IF EXISTS t_num,t_datetime,t_string_1,t_string_2,t_gis;
+--enable_warnings
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r $MYSQL_TEST_DIR/std_data/ndb_backup50_data_le >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r $MYSQL_TEST_DIR/std_data/ndb_backup50_data_le >> $NDB_TOOLS_OUTPUT
+SHOW TABLES;
+SHOW CREATE TABLE t_num;
+SHOW CREATE TABLE t_datetime;
+SHOW CREATE TABLE t_string_1;
+SHOW CREATE TABLE t_string_2;
+SHOW CREATE TABLE t_gis;
+SELECT * FROM t_datetime;
+SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
+SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
+SELECT * FROM t_string_2;
+SELECT AsText(t_point), AsText(t_linestring),AsText(t_polygon) FROM t_gis ORDER by t_pk;
+SELECT AsText(t_multipoint), AsText(t_multilinestring),AsText(t_multipolygon) FROM t_gis ORDER by t_pk;
+SELECT AsText(t_geometrycollection), AsText(t_geometry) FROM t_gis ORDER by t_pk;
+
+#
+# Restore backup files (from big endian)
+#
+
+DROP TABLE t_num,t_datetime,t_string_1,t_string_2,t_gis;
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r $MYSQL_TEST_DIR/std_data/ndb_backup50_data_be >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r $MYSQL_TEST_DIR/std_data/ndb_backup50_data_be >> $NDB_TOOLS_OUTPUT
+SHOW TABLES;
+SHOW CREATE TABLE t_num;
+SHOW CREATE TABLE t_datetime;
+SHOW CREATE TABLE t_string_1;
+SHOW CREATE TABLE t_string_2;
+SHOW CREATE TABLE t_gis;
+SELECT * FROM t_datetime;
+SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
+SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
+SELECT * FROM t_string_2;
+SELECT AsText(t_point), AsText(t_linestring),AsText(t_polygon) FROM t_gis ORDER by t_pk;
+SELECT AsText(t_multipoint), AsText(t_multilinestring),AsText(t_multipolygon) FROM t_gis ORDER by t_pk;
+SELECT AsText(t_geometrycollection), AsText(t_geometry) FROM t_gis ORDER by t_pk;
+
+DROP TABLE t_num,t_datetime,t_string_1,t_string_2,t_gis;