Commit 5677612a authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/tmp_merge 

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


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  Use local
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
parents 906cd90d 4c2db1be

mysql-test/r/func_time.result

+6 −6
Original line number Diff line number Diff line
@@ -361,12 +361,6 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT EXTRACT(QUARTER FROM '2004-01-15') AS quarter;

quarter

1
@@ -403,6 +397,12 @@ quarter 
SELECT EXTRACT(QUARTER FROM '2004-12-15') AS quarter;

quarter

4

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;

"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND

1968-01-20 03:14:08

mysql-test/r/sp-vars.result

+15 −0
Original line number Diff line number Diff line
@@ -1075,3 +1075,18 @@ SELECT f1(); 
f1()

abc

DROP FUNCTION f1;

DROP PROCEDURE IF EXISTS p1;

CREATE PROCEDURE p1()

BEGIN

DECLARE v_char VARCHAR(255);

DECLARE v_text TEXT DEFAULT '';

SET v_char = 'abc';

SET v_text = v_char;

SET v_char = 'def';

SET v_text = concat(v_text, '|', v_char);

SELECT v_text;

END|

CALL p1();

v_text

abc|def

DROP PROCEDURE p1;

mysql-test/t/func_time.test

+5 −5
Original line number Diff line number Diff line
@@ -143,10 +143,6 @@ select extract(SECOND FROM "1999-01-02 10:11:12"); 
select extract(MONTH FROM "2001-02-00");



#

# MySQL Bugs: #12356: DATE_SUB or DATE_ADD incorrectly returns null

#

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

# test EXTRACT QUARTER (Bug #18100)

#
@@ -162,7 +158,11 @@ SELECT EXTRACT(QUARTER FROM '2004-09-15') AS quarter; 
SELECT EXTRACT(QUARTER FROM '2004-10-15') AS quarter;

SELECT EXTRACT(QUARTER FROM '2004-11-15') AS quarter;

SELECT EXTRACT(QUARTER FROM '2004-12-15') AS quarter;



#

# MySQL Bugs: #12356: DATE_SUB or DATE_ADD incorrectly returns null

#

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);



#

# Test big intervals (Bug #3498)

mysql-test/t/information_schema.test

+36 −1
Original line number Diff line number Diff line
@@ -859,7 +859,40 @@ select concat(@a, table_name), @a, table_name 
from information_schema.tables where table_schema = 'test';

drop table t1,t2;



# End of 5.0 tests.

#

# Bug#20230: routine_definition is not null

#

--disable_warnings

DROP PROCEDURE IF EXISTS p1;

DROP FUNCTION IF EXISTS f1;

--enable_warnings



CREATE PROCEDURE p1() SET @a= 1;

CREATE FUNCTION f1() RETURNS INT RETURN @a + 1;

CREATE USER mysql_bug20230@localhost;

GRANT EXECUTE ON PROCEDURE p1 TO mysql_bug20230@localhost;

GRANT EXECUTE ON FUNCTION f1 TO mysql_bug20230@localhost;



SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES;

SHOW CREATE PROCEDURE p1;

SHOW CREATE FUNCTION f1;



connect (conn1, localhost, mysql_bug20230,,);



SELECT ROUTINE_NAME, ROUTINE_DEFINITION FROM INFORMATION_SCHEMA.ROUTINES;

SHOW CREATE PROCEDURE p1;

SHOW CREATE FUNCTION f1;

CALL p1();

SELECT f1();



disconnect conn1;

connection default;



DROP FUNCTION f1;

DROP PROCEDURE p1;

DROP USER mysql_bug20230@localhost;



--echo End of 5.0 tests.

#

# Show engines

#
@@ -877,3 +910,5 @@ select user,db from information_schema.processlist; 
connection default;

drop user user3148@localhost;



--echo End of 5.1 tests.

mysql-test/t/sp-vars.test

+36 −0
Original line number Diff line number Diff line
@@ -1271,3 +1271,39 @@ SELECT f1(); 
#



DROP FUNCTION f1;





#

# Bug#17226: Variable set in cursor on first iteration is assigned

# second iterations value

#

# The problem was in incorrect handling of local variables of type

# TEXT (BLOB).

#

--disable_warnings

DROP PROCEDURE IF EXISTS p1;

--enable_warnings



delimiter |;

CREATE PROCEDURE p1()

BEGIN

  DECLARE v_char VARCHAR(255);

  DECLARE v_text TEXT DEFAULT '';



  SET v_char = 'abc';



  SET v_text = v_char;



  SET v_char = 'def';



  SET v_text = concat(v_text, '|', v_char);



  SELECT v_text;

END|

delimiter ;|



CALL p1();



DROP PROCEDURE p1;



# End of 5.0 tests.