Commit 9887430f authored by unknown's avatar unknown
Browse files

Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  merge 5.0-opt -> 5.1-opt
mysql-test/t/subselect.test:
  merge 5.0-opt -> 5.1-opt
sql/sql_base.cc:
  merge 5.0-opt -> 5.1-opt
parents a88dac08 ec5051ff

mysql-test/r/delete.result

+9 −0
Original line number Diff line number Diff line
@@ -214,3 +214,12 @@ select count(*) from t1; 
count(*)

0

drop table t1;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1);

DELETE FROM t1 ORDER BY x;

ERROR 42S22: Unknown column 'x' in 'order clause'

DELETE FROM t1 ORDER BY t2.x;

ERROR 42S22: Unknown column 't2.x' in 'order clause'

DELETE FROM t1 ORDER BY (SELECT x);

ERROR 42S22: Unknown column 'x' in 'field list'

DROP TABLE t1;

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -730,6 +730,12 @@ point(b, b) IS NULL linestring(b) IS NULL polygon(b) IS NULL multipoint(b) IS NU 
1	1	1	1	1	1	1

0	1	1	1	1	1	1

drop table t1;

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

a

NULL

DROP TABLE t1;

End of 4.1 tests

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;

mysql-test/r/subselect.result

+19 −0
Original line number Diff line number Diff line
@@ -3905,6 +3905,25 @@ COUNT(*) a 
2	2

3	3

DROP TABLE t1,t2;

CREATE TABLE t1 (a int, b int);

CREATE TABLE t2 (m int, n int);

INSERT INTO t1 VALUES (2,2), (2,2), (3,3), (3,3), (3,3), (4,4);

INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);

SELECT COUNT(*) c, a,

(SELECT GROUP_CONCAT(COUNT(a)) FROM t2 WHERE m = a)

FROM t1 GROUP BY a;

c	a	(SELECT GROUP_CONCAT(COUNT(a)) FROM t2 WHERE m = a)

2	2	2

3	3	3

1	4	1,1

SELECT COUNT(*) c, a,

(SELECT GROUP_CONCAT(COUNT(a)+1) FROM t2 WHERE m = a)

FROM t1 GROUP BY a;

c	a	(SELECT GROUP_CONCAT(COUNT(a)+1) FROM t2 WHERE m = a)

2	2	3

3	3	4

1	4	2,2

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);

mysql-test/t/delete.test

+18 −0
Original line number Diff line number Diff line
@@ -203,3 +203,21 @@ select * from t1 where a is null; 
delete from t1 where a is null;

select count(*) from t1;

drop table t1;



#

# Bug #26186: delete order by, sometimes accept unknown column

#

CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (1);



--error ER_BAD_FIELD_ERROR

DELETE FROM t1 ORDER BY x;



# even columns from a table not used in query (and not even existing)

--error ER_BAD_FIELD_ERROR

DELETE FROM t1 ORDER BY t2.x;



# subquery (as long as the subquery from is valid or DUAL)

--error ER_BAD_FIELD_ERROR

DELETE FROM t1 ORDER BY (SELECT x);



DROP TABLE t1;

mysql-test/t/gis.test

+8 −0
Original line number Diff line number Diff line
@@ -424,6 +424,14 @@ from t1; 


drop table t1;



#

# Bug #27164: Crash when mixing InnoDB and MyISAM Geospatial tables

#

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

DROP TABLE t1;



--echo End of 4.1 tests



#