Commit efcd6b42 authored by unknown's avatar unknown
Browse files

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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
parents 9852dfbc d76cf997

include/my_time.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ int my_TIME_to_str(const MYSQL_TIME *l_time, char *to); 
/*

  The following must be sorted so that simple intervals comes first.

  (get_interval_value() depends on this)

  When updating this enum please update 

  LEX_STRING interval_type_to_name[] in sql/time.cc

*/



enum interval_type

mysql-test/r/ps.result

+98 −1
Original line number Diff line number Diff line
@@ -546,7 +546,103 @@ GROUP_CONCAT(Track SEPARATOR ', ') 
CAD

DEALLOCATE PREPARE STMT;

DROP TABLE t1;

End of 4.1 tests

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT, INDEX(i));

INSERT INTO t1 VALUES (1);

PREPARE stmt FROM "SELECT (COUNT(i) = 1), COUNT(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(COUNT(i) = 1)	COUNT(i)

0	0

SET @a = 1;

EXECUTE stmt USING @a;

(COUNT(i) = 1)	COUNT(i)

1	1

SET @a = 0;

EXECUTE stmt USING @a;

(COUNT(i) = 1)	COUNT(i)

0	0

PREPARE stmt FROM "SELECT (AVG(i) = 1), AVG(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(AVG(i) = 1)	AVG(i)

NULL	NULL

SET @a = 1;

EXECUTE stmt USING @a;

(AVG(i) = 1)	AVG(i)

1	1.0000

SET @a = 0;

EXECUTE stmt USING @a;

(AVG(i) = 1)	AVG(i)

NULL	NULL

PREPARE stmt FROM "SELECT (VARIANCE(i) = 1), VARIANCE(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(VARIANCE(i) = 1)	VARIANCE(i)

NULL	NULL

SET @a = 1;

EXECUTE stmt USING @a;

(VARIANCE(i) = 1)	VARIANCE(i)

0	0.0000

SET @a = 0;

EXECUTE stmt USING @a;

(VARIANCE(i) = 1)	VARIANCE(i)

NULL	NULL

PREPARE stmt FROM "SELECT (STDDEV(i) = 1), STDDEV(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(STDDEV(i) = 1)	STDDEV(i)

NULL	NULL

SET @a = 1;

EXECUTE stmt USING @a;

(STDDEV(i) = 1)	STDDEV(i)

0	0.0000

SET @a = 0;

EXECUTE stmt USING @a;

(STDDEV(i) = 1)	STDDEV(i)

NULL	NULL

PREPARE stmt FROM "SELECT (BIT_OR(i) = 1), BIT_OR(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_OR(i) = 1)	BIT_OR(i)

0	0

SET @a = 1;

EXECUTE stmt USING @a;

(BIT_OR(i) = 1)	BIT_OR(i)

1	1

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_OR(i) = 1)	BIT_OR(i)

0	0

PREPARE stmt FROM "SELECT (BIT_AND(i) = 1), BIT_AND(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_AND(i) = 1)	BIT_AND(i)

0	18446744073709551615

SET @a = 1;

EXECUTE stmt USING @a;

(BIT_AND(i) = 1)	BIT_AND(i)

1	1

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_AND(i) = 1)	BIT_AND(i)

0	18446744073709551615

PREPARE stmt FROM "SELECT (BIT_XOR(i) = 1), BIT_XOR(i) FROM t1 WHERE i = ?";

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_XOR(i) = 1)	BIT_XOR(i)

0	0

SET @a = 1;

EXECUTE stmt USING @a;

(BIT_XOR(i) = 1)	BIT_XOR(i)

1	1

SET @a = 0;

EXECUTE stmt USING @a;

(BIT_XOR(i) = 1)	BIT_XOR(i)

0	0

DEALLOCATE PREPARE stmt;

DROP TABLE t1;

End of 4.1 tests.

create table t1 (a varchar(20));

insert into t1 values ('foo');

prepare stmt FROM 'SELECT char_length (a) FROM t1';
@@ -1360,6 +1456,7 @@ i 
1

DEALLOCATE PREPARE stmt;

DROP TABLE t1, t2;

DROP PROCEDURE IF EXISTS p1;

End of 5.0 tests.

create procedure proc_1() reset query cache;

call proc_1();

mysql-test/r/sp-error.result

+28 −4
Original line number Diff line number Diff line
@@ -1226,6 +1226,30 @@ END; 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IF NOT EXISTS bug14702()

BEGIN

END' at line 1

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT);

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO @a;

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO DUMPFILE "file";

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO OUTFILE "file";

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953()

CREATE VIEW v AS SELECT i FROM t1 PROCEDURE ANALYSE();

ERROR HY000: View's SELECT contains a 'PROCEDURE' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 FROM (SELECT 1) AS d1;

ERROR HY000: View's SELECT contains a subquery in the FROM clause

CREATE PROCEDURE bug20953(i INT) CREATE VIEW v AS SELECT i;

ERROR HY000: View's SELECT contains a variable or parameter

CREATE PROCEDURE bug20953()

BEGIN

DECLARE i INT;

CREATE VIEW v AS SELECT i;

END |

ERROR HY000: View's SELECT contains a variable or parameter

PREPARE stmt FROM "CREATE VIEW v AS SELECT ?";

ERROR HY000: View's SELECT contains a variable or parameter

DROP TABLE t1;

End of 5.0 tests

drop function if exists bug16164;

create function bug16164() returns int
@@ -1234,9 +1258,9 @@ show authors; 
return 42;

end|

ERROR 0A000: Not allowed to return a result set from a function

drop function if exists bug20701|

create function bug20701() returns varchar(25) binary return "test"|

drop function if exists bug20701;

create function bug20701() returns varchar(25) binary return "test";

ERROR 42000: This version of MySQL doesn't yet support 'return value collation'

create function bug20701() returns varchar(25) return "test"|

drop function bug20701|

create function bug20701() returns varchar(25) return "test";

drop function bug20701;

End of 5.1 tests

mysql-test/r/view.result

+17 −5
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ create table t1 (a int, b int); 
insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);

create view v1 (c,d) as select a,b+@@global.max_user_connections from t1;

ERROR HY000: View's SELECT contains a variable or parameter

create view v1 (c,d) as select a,b from t1

where a = @@global.max_user_connections;

ERROR HY000: View's SELECT contains a variable or parameter

create view v1 (c) as select b+1 from t1;

select c from v1;

c
@@ -596,11 +599,6 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function 
drop view v1;

create view v1 (a,a) as select 'a','a';

ERROR 42S21: Duplicate column name 'a'

drop procedure if exists p1;

create procedure p1 () begin declare v int; create view v1 as select v; end;//

call p1();

ERROR HY000: View's SELECT contains a variable or parameter

drop procedure p1;

create table t1 (col1 int,col2 char(22));

insert into t1 values(5,'Hello, world of views');

create view v1 as select * from t1;
@@ -886,6 +884,8 @@ ERROR HY000: View's SELECT contains a 'INTO' clause 
create table t1 (a int);

create view v1 as select a from t1 procedure analyse();

ERROR HY000: View's SELECT contains a 'PROCEDURE' clause

create view v1 as select 1 from (select 1) as d1;

ERROR HY000: View's SELECT contains a subquery in the FROM clause

drop table t1;

create table t1 (s1 int, primary key (s1));

create view v1 as select * from t1;
@@ -2956,6 +2956,18 @@ View Create View 
v1	CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`pk` AS `pk` from (`t1` join `t2` on(((`t2`.`fk` = `t1`.`pk`) and (`t2`.`ver` = (select max(`t`.`ver`) AS `MAX(t.ver)` from `t2` `t` where (`t`.`org` = `t2`.`org`))))))

DROP VIEW v1;

DROP TABLE t1, t2;

DROP FUNCTION IF EXISTS f1;

DROP VIEW IF EXISTS v1;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT);

INSERT INTO t1 VALUES (1);

CREATE VIEW v1 AS SELECT MAX(i) FROM t1;

CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW

SET NEW.i = (SELECT * FROM v1) + 1;

INSERT INTO t1 VALUES (1);

CREATE FUNCTION f1() RETURNS INT RETURN (SELECT * FROM v1);

UPDATE t1 SET i= f1();

DROP FUNCTION f1;

CREATE TABLE t1(id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, val INT UNSIGNED NOT NULL);

CREATE VIEW v1 AS SELECT id, val FROM t1 WHERE val >= 1 AND val <= 5 WITH CHECK OPTION;

INSERT INTO v1 (val) VALUES (2);

mysql-test/t/func_gconcat.test

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ select ifnull(group_concat(concat(t1.id, ':', t1.name)), 'shortname') as 'withou 
select distinct ifnull(group_concat(concat(t1.id, ':', t1.name)), 'shortname') as 'with distinct: cutoff at length of shortname' from t1;

drop table t1;



# check zero rows

# check zero rows (bug#836)

create table t1(id int);

create table t2(id int);

insert into t1 values(0),(1);