Commit 6cf8483d authored by unknown's avatar unknown
Browse files

merged 


mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents f095abaa c34e0817

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|

mysql-test/r/sp.result

+83 −2
Original line number Diff line number Diff line
@@ -4100,8 +4100,6 @@ x 
4711

drop procedure bug14376|

drop procedure if exists p1|

Warnings:

Note	1305	PROCEDURE p1 does not exist

drop table if exists t1|

create table t1 (a varchar(255))|

insert into t1 (a) values ("a - table column")|
@@ -4153,6 +4151,89 @@ A local variable in a nested compound statement takes precedence over table colu 
a - local variable in a nested compound statement

A local variable in a nested compound statement takes precedence over table column in cursors

a - local variable in a nested compound statement

drop procedure p1|

drop procedure if exists bug13012|

create procedure bug13012()

BEGIN

REPAIR TABLE t1;

BACKUP TABLE t1 to '../tmp';

DROP TABLE t1;

RESTORE TABLE t1 FROM '../tmp';

END|

call bug13012()|

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK

Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

drop procedure bug13012|

create view v1 as select * from t1|

create procedure bug13012()

BEGIN

REPAIR TABLE t1,t2,t3,v1;

OPTIMIZE TABLE t1,t2,t3,v1;

ANALYZE TABLE t1,t2,t3,v1;

END|

call bug13012()|

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t2	repair	status	OK

test.t3	repair	error	Table 'test.t3' doesn't exist

test.v1	repair	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

test.t2	optimize	status	OK

test.t3	optimize	error	Table 'test.t3' doesn't exist

test.v1	optimize	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

test.t2	analyze	status	Table is already up to date

test.t3	analyze	error	Table 'test.t3' doesn't exist

test.v1	analyze	error	'test.v1' is not BASE TABLE

Warnings:

Error	1347	'test.v1' is not BASE TABLE

call bug13012()|

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t2	repair	status	OK

test.t3	repair	error	Table 'test.t3' doesn't exist

test.v1	repair	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

test.t2	optimize	status	OK

test.t3	optimize	error	Table 'test.t3' doesn't exist

test.v1	optimize	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

test.t2	analyze	status	Table is already up to date

test.t3	analyze	error	Table 'test.t3' doesn't exist

test.v1	analyze	error	'test.v1' is not BASE TABLE

Warnings:

Error	1347	'test.v1' is not BASE TABLE

call bug13012()|

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t2	repair	status	OK

test.t3	repair	error	Table 'test.t3' doesn't exist

test.v1	repair	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

test.t2	optimize	status	OK

test.t3	optimize	error	Table 'test.t3' doesn't exist

test.v1	optimize	error	'test.v1' is not BASE TABLE

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

test.t2	analyze	status	Table is already up to date

test.t3	analyze	error	Table 'test.t3' doesn't exist

test.v1	analyze	error	'test.v1' is not BASE TABLE

Warnings:

Error	1347	'test.v1' is not BASE TABLE

drop procedure bug13012|

drop view v1;

select * from t1|

a

a - table column

drop schema if exists mysqltest1|

Warnings:

Note	1008	Can't drop database 'mysqltest1'; database doesn't exist