Commit cf0b4702 authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/alexi/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
parents c0c40c5f d78dc15b

mysql-test/r/sp-error.result

+21 −0
Original line number Diff line number Diff line
@@ -765,3 +765,24 @@ OPTIMIZE TABLE t1; 
RETURN 1;

END|

ERROR 0A000: OPTIMIZE TABLE is not allowed in stored procedures

DROP FUNCTION IF EXISTS bug12995|

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

HANDLER t1 OPEN;

RETURN 1;

END|

ERROR 0A000: HANDLER is not allowed in stored procedures

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

HANDLER t1 READ FIRST;

RETURN 1;

END|

ERROR 0A000: HANDLER is not allowed in stored procedures

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

HANDLER t1 CLOSE;

RETURN 1;

END|

ERROR 0A000: HANDLER is not allowed in stored procedures

SELECT bug12995()|

ERROR 42000: FUNCTION test.bug12995 does not exist

mysql-test/r/view.result

+9 −0
Original line number Diff line number Diff line
@@ -2151,6 +2151,15 @@ select * from v1; 
strcmp(f1,'a')

drop view v1;

drop table t1;

create table t1 (f1 int, f2 int,f3 int);

insert into t1 values (1,10,20),(2,0,0);

create view v1 as select * from t1;

select if(sum(f1)>1,f2,f3) from v1 group by f1;

if(sum(f1)>1,f2,f3)

20

0

drop view v1;

drop table t1;

create table t1 (

r_object_id char(16) NOT NULL,

group_name varchar(32) NOT NULL

mysql-test/t/sp-error.test

+30 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,36 @@ BEGIN 
  OPTIMIZE TABLE t1;

  RETURN 1;

END|

delimiter ;|



#

# Bug##12995 "Inside function "Table 't4' was not locked with LOCK TABLES"

#

delimiter |;

--disable_warnings

DROP FUNCTION IF EXISTS bug12995|

--enable_warnings

--error ER_SP_BADSTATEMENT

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

  HANDLER t1 OPEN;

  RETURN 1;

END|

--error ER_SP_BADSTATEMENT

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

  HANDLER t1 READ FIRST;

  RETURN 1;

END|

--error ER_SP_BADSTATEMENT

CREATE FUNCTION bug12995() RETURNS INT

BEGIN

  HANDLER t1 CLOSE;

  RETURN 1;

END|

--error 1305

SELECT bug12995()|

delimiter ;|



#

# BUG#NNNN: New bug synopsis

mysql-test/t/view.test

+8 −0
Original line number Diff line number Diff line
@@ -2020,6 +2020,14 @@ drop view v1; 
drop table t1;



#

# Bug #12922 if(sum(),...) with group from view returns wrong results 

#

create table t1 (f1 int, f2 int,f3 int);

insert into t1 values (1,10,20),(2,0,0);

create view v1 as select * from t1;

select if(sum(f1)>1,f2,f3) from v1 group by f1;

drop view v1;

drop table t1;

# BUG#12941

#

create table t1 (

sql/examples/ha_tina.cc

+2 −1
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ int ha_tina::rnd_init(bool scan) 
  records= 0;

  chain_ptr= chain;

#ifdef HAVE_MADVISE

  if (scan)

    (void)madvise(share->mapped_file,share->file_stat.st_size,MADV_SEQUENTIAL);

#endif