Commit 19ce8656 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
parents 6098f770 f469aa00

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -2933,3 +2933,4 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

libmysqld/sql_servers.cc

mysql-test/r/func_math.result

+40 −5
Original line number Diff line number Diff line
@@ -177,11 +177,46 @@ drop table t1; 
select abs(-2) * -2;

abs(-2) * -2

-4

create table t1 (i int);

insert into t1 values (1);

select rand(i) from t1;

ERROR HY000: Incorrect arguments to RAND

drop table t1;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1),(1),(1),(2);

SELECT CAST(RAND(2) * 1000 AS UNSIGNED), CAST(RAND(a) * 1000 AS UNSIGNED) 

FROM t1;

CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(a) * 1000 AS UNSIGNED)

656	405

122	405

645	405

858	656

SELECT CAST(RAND(2) * 1000 AS UNSIGNED), CAST(RAND(a) * 1000 AS UNSIGNED) 

FROM t1 WHERE a = 1;

CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(a) * 1000 AS UNSIGNED)

656	405

122	405

645	405

INSERT INTO t1 VALUES (3);

SELECT CAST(RAND(2) * 1000 AS UNSIGNED), CAST(RAND(a) * 1000 AS UNSIGNED) 

FROM t1;

CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(a) * 1000 AS UNSIGNED)

656	405

122	405

645	405

858	656

354	906

SELECT CAST(RAND(2) * 1000 AS UNSIGNED), CAST(RAND(a) * 1000 AS UNSIGNED) 

FROM t1 WHERE a = 1;

CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(a) * 1000 AS UNSIGNED)

656	405

122	405

645	405

PREPARE stmt FROM 

"SELECT CAST(RAND(2) * 1000 AS UNSIGNED), CAST(RAND(?) * 1000 AS UNSIGNED)

    FROM t1 WHERE a = 1";

set @var=2;

EXECUTE stmt USING @var;

CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(?) * 1000 AS UNSIGNED)

656	656

122	122

645	645

DROP TABLE t1;

create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;

insert into t1 values ('http://www.foo.com/', now());

select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));

mysql-test/r/gis.result

+11 −0
Original line number Diff line number Diff line
@@ -718,3 +718,14 @@ desc t1; 
Field	Type	Null	Key	Default	Extra

GeomFromText('point(1 1)')	geometry	NO			

drop table t1;

create table t1 (f1 tinyint(1), f2 char(1), f3 varchar(1), f4 geometry, f5 datetime);

create view v1 as select * from t1;

desc v1;

Field	Type	Null	Key	Default	Extra

f1	tinyint(1)	YES		NULL	

f2	char(1)	YES		NULL	

f3	varchar(1)	YES		NULL	

f4	geometry	YES		NULL	

f5	datetime	YES		NULL	

drop view v1;

drop table t1;

mysql-test/r/innodb.result

+0 −2
Original line number Diff line number Diff line
@@ -3447,8 +3447,6 @@ SELECT p0.a FROM t2 p0 WHERE BINARY p0.b = 'customer_over'; 
a

1

drop table t2, t1;

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

ERROR HY000: The used table type doesn't support SPATIAL indexes

CREATE TABLE t1 ( a int ) ENGINE=innodb;

BEGIN;

INSERT INTO t1 VALUES (1);

mysql-test/r/innodb_gis.result

+2 −0
Original line number Diff line number Diff line
@@ -460,3 +460,5 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field 
insert into t1 (fl) values (pointfromtext('point(1,1)'));

ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field

drop table t1;

create table t1 (g geometry not null, spatial gk(g)) engine=innodb;

ERROR HY000: The used table type doesn't support SPATIAL indexes