Commit fa86430f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/mysql/tmp_merge 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
parents 28c8134c 86f9bdf8

mysql-test/r/date_formats.result

+9 −0
Original line number Diff line number Diff line
@@ -506,3 +506,12 @@ d1 d2 
02	February

01	January

drop table t1;

select str_to_date( 1, NULL );

str_to_date( 1, NULL )

NULL

select str_to_date( NULL, 1 );

str_to_date( NULL, 1 )

NULL

select str_to_date( 1, IF(1=1,NULL,NULL) );

str_to_date( 1, IF(1=1,NULL,NULL) )

NULL

mysql-test/r/sp-error.result

+29 −0
Original line number Diff line number Diff line
@@ -1134,3 +1134,32 @@ show procedure status; 
Db	Name	Type	Definer	Modified	Created	Security_type	Comment

test	 bug15658	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	

drop procedure ` bug15658`;

drop function if exists bug14270;

drop table if exists t1;

create table t1 (s1 int primary key);

create function bug14270() returns int

begin

load index into cache t1;

return 1;

end|

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

create function bug14270() returns int

begin

cache index t1 key (`primary`) in keycache1;

return 1;

end|

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

drop table t1;

drop procedure if exists bug15091;

create procedure bug15091()

begin

declare selectstr varchar(6000) default ' ';

declare conditionstr varchar(5000)  default '';

set selectstr = concat(selectstr,

' and ',

c.operatorid,

'in (',conditionstr, ')');

end|

call bug15091();

ERROR 42S02: Unknown table 'c' in field list

drop procedure bug15091;

mysql-test/r/sp-security.result

+23 −0
Original line number Diff line number Diff line
@@ -291,3 +291,26 @@ drop user user1_bug14834@localhost; 
drop user user2_bug14834@localhost;

drop user user3_bug14834@localhost;

drop database db_bug14834;

create database db_bug14533;

use db_bug14533;

create table t1 (id int);

create user user_bug14533@localhost identified by '';

create procedure bug14533_1()

sql security definer

desc db_bug14533.t1;

create procedure bug14533_2()

sql security definer

select * from db_bug14533.t1;

grant execute on procedure db_bug14533.bug14533_1 to user_bug14533@localhost;

grant execute on procedure db_bug14533.bug14533_2 to user_bug14533@localhost;

call db_bug14533.bug14533_1();

Field	Type	Null	Key	Default	Extra

id	int(11)	YES		NULL	

call db_bug14533.bug14533_2();

id

desc db_bug14533.t1;

ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'

select * from db_bug14533.t1;

ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'

drop user user_bug14533@localhost;

drop database db_bug14533;

mysql-test/r/sp.result

+19 −0
Original line number Diff line number Diff line
@@ -4425,4 +4425,23 @@ drop procedure if exists bug15231_1| 
drop procedure if exists bug15231_2|

drop procedure if exists bug15231_3|

drop procedure if exists bug15231_4|

drop procedure if exists bug15011|

create table t3 (c1 int primary key)|

insert into t3 values (1)|

create procedure bug15011()

deterministic

begin

declare continue handler for 1062

select 'Outer' as 'Handler';

begin

declare continue handler for 1062

select 'Inner' as 'Handler';

insert into t3 values (1);

end;

end|

call bug15011()|

Handler

Inner

drop procedure bug15011|

drop table t3|

drop table t1,t2;

mysql-test/t/date_formats.test

+7 −0
Original line number Diff line number Diff line
@@ -272,4 +272,11 @@ insert into t1 (f1) values ("2005-01-01"); 
insert into t1 (f1) values ("2005-02-01");

select date_format(f1, "%m") as d1, date_format(f1, "%M") as d2 from t1 order by date_format(f1, "%M");

drop table t1;



#

# Bug #15828

#

select str_to_date( 1, NULL );

select str_to_date( NULL, 1 );

select str_to_date( 1, IF(1=1,NULL,NULL) );

# End of 4.1 tests