Commit 9166c711 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into  chilla.local:/home/mydev/mysql-4.1-axmrg
parents a4ad07b7 8ca9c928

mysql-test/lib/mtr_unique.pl

+9 −3
Original line number Diff line number Diff line
@@ -10,12 +10,18 @@ use Fcntl ':flock'; 
# Requested IDs are stored in a hash and released upon END.

#

my %mtr_unique_assigned_ids = ();

my $mtr_unique_pid;

BEGIN {

	$mtr_unique_pid = $$ unless defined $mtr_unique_pid;

}

END { 

	if($mtr_unique_pid == $$) {

		while(my ($id,$file) = each(%mtr_unique_assigned_ids)) {

			print "Autoreleasing $file:$id\n";

			mtr_release_unique_id($file, $id);

		}

	}

}



#

# Require a unique, numerical ID, given a file name (where all

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -671,3 +671,9 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is 
def					asbinary(g)	252	8192	0	Y	128	0	63

asbinary(g)

drop table t1;

create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));

alter table t1 disable keys;

load data infile '../../std_data/bad_gis_data.dat' into table t1;

ERROR 01000: Data truncated; NULL supplied to NOT NULL column 'b' at row 1

alter table t1 enable keys;

drop table t1;

mysql-test/std_data/bad_gis_data.dat

0 → 100644
+1 −0
Original line number Diff line number Diff line 
foo

mysql-test/t/gis.test

+9 −2
Original line number Diff line number Diff line
@@ -363,11 +363,18 @@ drop table t1; 
select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000))));

select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));



# End of 4.1 tests



--enable_metadata

create table t1 (g GEOMETRY);

select * from t1;

select asbinary(g) from t1;

--disable_metadata

drop table t1;



create table t1 (a TEXT, b GEOMETRY NOT NULL, SPATIAL KEY(b));

alter table t1 disable keys;

--error 1263

load data infile '../../std_data/bad_gis_data.dat' into table t1;

alter table t1 enable keys;

drop table t1;



# End of 4.1 tests

scripts/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ SUFFIXES = .sh 
	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \

	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \

	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \

	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \

	  -e 's!@''CC''@!@CC@!'\

	  -e 's!@''CXX''@!@CXX@!'\

	  -e 's!@''GXX''@!@GXX@!'\