Commit df552c31 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
parents f1674d1b 83eed4d8

mysql-test/Makefile.am

+9 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. 


dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data $(distdir)/lib

		$(distdir)/std_data \

		$(distdir)/std_data/ndb_backup50_data_be $(distdir)/std_data/ndb_backup50_data_le \

		$(distdir)/lib

	-$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t
@@ -62,6 +64,8 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(distdir)/std_data/ndb_backup50_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(distdir)/std_data/ndb_backup50_data_le

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib

	-rm -rf `find $(distdir)/suite -type d -name SCCS`
@@ -71,6 +75,8 @@ install-data-local: 
		$(DESTDIR)$(testdir)/r \

		$(DESTDIR)$(testdir)/include \

		$(DESTDIR)$(testdir)/std_data \

		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \

		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \

		$(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
@@ -95,6 +101,8 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

	for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \

	do \

mysql-test/r/ndb_restore_different_endian_data.result

0 → 100644
+200 −0
Original line number Diff line number Diff line 
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;

mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data

0 → 100644
+46.8 KiB

File added.

No diff preview for this file type.

View file

mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data

0 → 100644
+17.2 KiB

File added.

No diff preview for this file type.

View file

mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl

0 → 100644
+24.1 KiB

File added.

No diff preview for this file type.

View file