Commit 70cce17d authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
parents ca18ae84 53862e60

include/config-win.h

+2 −2
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_SPATIAL 1

#define HAVE_RTREE_KEYS 1



/* #undef HAVE_OPENSSL */

/* #undef HAVE_YASSL */

#define HAVE_OPENSSL 1

#define HAVE_YASSL 1



/* Define charsets you want */

/* #undef HAVE_CHARSET_armscii8 */

mysql-test/lib/mtr_timer.pl

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ sub mtr_timer_start($$$) { 
    {

      # Child, redirect output and exec

      # FIXME do we need to redirect streams?



      # Don't do the ^C cleanup in the timeout child processes!

      # There is actually a race here, if we get ^C after fork(), but before

      # clearing the signal handler.

      $SIG{INT}= 'DEFAULT';



      $0= "mtr_timer(timers,$name,$duration)";

      sleep($duration);

      exit(0);

mysql-test/r/information_schema.result

+7 −0
Original line number Diff line number Diff line
@@ -281,6 +281,13 @@ sub1 sub1 
select count(*) from information_schema.ROUTINES;

count(*)

2

create view v1 as select routine_schema, routine_name from information_schema.routines 

order by routine_schema, routine_name;

select * from v1;

routine_schema	routine_name

test	sel2

test	sub1

drop view v1;

select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;

ROUTINE_NAME	ROUTINE_DEFINITION

show create function sub1;

mysql-test/r/information_schema_db.result

+14 −0
Original line number Diff line number Diff line
@@ -27,4 +27,18 @@ create database `inf%`; 
use `inf%`;

show tables;

Tables_in_inf%

grant all privileges on `inf%`.* to 'mysqltest_1'@'localhost';

create table t1 (f1 int);

create function func1(curr_int int) returns int

begin

declare ret_val int;

select max(f1) from t1 into ret_val;

return ret_val;

end|

create view v1 as select f1 from t1 where f1 = func1(f1);

select * from information_schema.tables;

drop user mysqltest_1@localhost;

drop view v1;

drop function func1;

drop table t1;

drop database `inf%`;

mysql-test/r/query_cache_notembedded.result

+30 −0
Original line number Diff line number Diff line
@@ -314,4 +314,34 @@ drop procedure f2; 
drop procedure f3;

drop procedure f4;

drop table t1;

reset query cache;

drop function if exists f1;

create table t1 (id int);

create function f1 ()

returns int

begin

declare i_var int;

set i_var = sleep(3);

insert into t1 values(3);

set i_var = sleep(3);

return 0;

end;|

 select f1();

select sleep(4);

sleep(4)

0

select * from t1;

id

3

f1()

0

select * from t1;

id

3

reset query cache;

select * from t1;

id

3

drop table t1;

drop function f1;

set GLOBAL query_cache_size=0;