Commit 2dbeedd5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 

into  mysql.com:/usr/home/pem/mysql-5.1-new


BitKeeper/triggers/post-commit:
  Merge.
configure.in:
  Manual merge.
mysql-test/r/sp.result:
  Merge.
mysql-test/r/view.result:
  Merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp_head.cc:
  Merge.
sql/sql_parse.cc:
  Merge.
sql/sql_table.cc:
  Merge.
sql/sql_yacc.yy:
  Merge.
parents 20f59cd2 9c8773f5

BitKeeper/triggers/post-commit

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


#shift

FROM=$USER@mysql.com

INTERNALS=internals@lists.mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="5.1"
@@ -61,14 +61,14 @@ EOF 
 ) | /usr/sbin/sendmail -t



#++

# internals@ mail

# commits@ mail

#--

 echo "Notifying internals list at $INTERNALS"

 echo "Notifying commits list at $COMMITS"

 (

   cat <<EOF

List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

To: $COMMITS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

X-CSetKey: <$CSETKEY>

$BH

extra/yassl/include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ long SSL_CTX_sess_set_cache_size(SSL_CTX*, long); 
long SSL_CTX_set_tmp_dh(SSL_CTX*, DH*);



void OpenSSL_add_all_algorithms(void);

void SSL_library_init();

void SSLeay_add_ssl_algorithms(void);

extra/yassl/src/ssl.cpp

+4 −0
Original line number Diff line number Diff line
@@ -648,6 +648,10 @@ void OpenSSL_add_all_algorithms() // compatibility only 
{}





void SSL_library_init()  // compatibility only

{}





DH* DH_new(void)

{

    DH* dh = new (ys) DH;

include/mysql.h

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ typedef unsigned long long my_ulonglong; 


#define MYSQL_COUNT_ERROR (~(my_ulonglong) 0)



/* backward compatibility define - to be removed eventually */

#define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED



typedef struct st_mysql_rows {

  struct st_mysql_rows *next;		/* list of rows */

  MYSQL_ROW data;

mysql-test/r/sp-error.result

+34 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ BEGIN 
OPTIMIZE TABLE t1;

RETURN 1;

END|

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

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

DROP FUNCTION IF EXISTS bug12995|

CREATE FUNCTION bug12995() RETURNS INT

BEGIN
@@ -981,6 +981,8 @@ END | 
drop table t1|

drop function bug_13627_f|

drop function if exists bug12329;

Warnings:

Note	1305	FUNCTION bug12329 does not exist

create table t1 as select 1 a;

create table t2 as select 1 a;

create function bug12329() returns int return (select a from t1);
@@ -1055,3 +1057,34 @@ Db Name Type Definer Modified Created Security_type Comment 
mysqltest2	p1	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	

drop database mysqltest2;

use test;

DROP FUNCTION IF EXISTS bug13012|

CREATE FUNCTION bug13012() RETURNS INT

BEGIN

REPAIR TABLE t1;

RETURN 1;

END|

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

CREATE FUNCTION bug13012() RETURNS INT

BEGIN

BACKUP TABLE t1 TO '/tmp';

RETURN 1;

END|

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

CREATE FUNCTION bug13012() RETURNS INT

BEGIN

RESTORE TABLE t1 FROM '/tmp';

RETURN 1;

END|

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

create table t1 (a int)|

CREATE PROCEDURE bug13012_1() REPAIR TABLE t1|

CREATE FUNCTION bug13012_2() RETURNS INT

BEGIN

CALL bug13012_1();

RETURN 1;

END|

SELECT bug13012_2()|

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

drop table t1|

drop procedure bug13012_1|

drop function bug13012_2|