Commit 2b0189b8 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
parents dcbf6188 8a2b3baa

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

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

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

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/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/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50

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

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

+16 −10
Original line number Diff line number Diff line
@@ -673,6 +673,22 @@ POINT(10 10) 
select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))));

(asWKT(geomfromwkb((0x010100000000000000000024400000000000002440))))

POINT(10 10)

create table t1 (g GEOMETRY);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63

g

select asbinary(g) from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					asbinary(g)	252	16777216	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_ln/bad_gis_data.dat' into table t1;

ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'b' at row 1

alter table t1 enable keys;

drop table t1;

create table t1 (s1 geometry not null,s2 char(100));

create trigger t1_bu before update on t1 for each row set new.s1 = null;

insert into t1 values (null,null);
@@ -697,16 +713,6 @@ alter table t1 add primary key pti(pt); 
ERROR 42000: BLOB/TEXT column 'pt' used in key specification without a key length

alter table t1 add primary key pti(pt(20));

drop table t1;

create table t1 (g GEOMETRY);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	g	g	255	4294967295	0	Y	144	0	63

g

select asbinary(g) from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					asbinary(g)	252	16777216	0	Y	128	0	63

asbinary(g)

drop table t1;

create table t1 select GeomFromText('point(1 1)');

desc t1;

Field	Type	Null	Key	Default	Extra

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -3592,3 +3592,9 @@ FROM t1) t; 
COUNT(*)

3000

DROP TABLE t1,t2;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

mysql-test/std_data/bad_gis_data.dat

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