Commit f14bb14c authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
parents 261136c0 d36a35a4

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -3580,7 +3580,7 @@ sub valgrind_arguments { 


  if ( $opt_valgrind_options )

  {

    mtr_add_arg($args, split(' ', $opt_valgrind_options));

    mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));

  }

mysql-test/r/case.result

+8 −0
Original line number Diff line number Diff line
@@ -175,6 +175,14 @@ SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END; 
case+union+test

case+union+test

nobug

create table t1(a float, b int default 3);

insert into t1 (a) values (2), (11), (8);

select min(a), min(case when 1=1 then a else NULL end),

min(case when 1!=1 then NULL else a end) 

from t1 where b=3 group by b;

min(a)	min(case when 1=1 then a else NULL end)	min(case when 1!=1 then NULL else a end)

2	2	2

drop table t1;

CREATE TABLE t1 (EMPNUM INT);

INSERT INTO t1 VALUES (0), (2);

CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));

mysql-test/r/events_logs_tests.result

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ SLEEP(3) 
0

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

root[root] @ localhost []	00:00:03	events_test	SELECT SLEEP(3)

root[root] @ localhost []	SLEEPVAL	events_test	SELECT SLEEP(3)

TRUNCATE mysql.slow_log;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

"This won't go to the slow log"
@@ -75,7 +75,7 @@ slo_val val 
"Check slow log. Should see 1 row because 5 is over the threshold of 4 for GLOBAL, though under SESSION which is 10"

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

root[root] @ localhost [localhost]	00:00:05	events_test	INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(5)

root[root] @ localhost [localhost]	SLEEPVAL	events_test	INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(5)

DROP EVENT long_event2;

SET GLOBAL  long_query_time =@old_global_long_query_time;

SET SESSION long_query_time =@old_session_long_query_time;

mysql-test/r/events_scheduling.result

+8 −2
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ CREATE TABLE table_1(a int); 
CREATE TABLE table_2(a int);

CREATE TABLE table_3(a int);

CREATE TABLE table_4(a int);

CREATE TABLE T19170(s1 TIMESTAMP);

SET GLOBAL event_scheduler=1;

CREATE EVENT E19170 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO T19170 VALUES(CURRENT_TIMESTAMP);

CREATE EVENT two_sec ON SCHEDULE EVERY 2 SECOND DO INSERT INTO table_1 VALUES(1);

CREATE EVENT start_n_end

ON SCHEDULE EVERY 1 SECOND
@@ -29,8 +31,8 @@ DROP EVENT two_sec; 
SELECT IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;

IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')

OK

SELECT IF(LAST_EXECUTED-ENDS < 2, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;

IF(LAST_EXECUTED-ENDS < 2, 'OK', 'ERROR')

SELECT IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR') FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='start_n_end' AND ENDS IS NOT NULL;

IF(LAST_EXECUTED-ENDS < 3, 'OK', 'ERROR')

OK

DROP EVENT start_n_end;

"Already dropped because ended. Therefore an error."
@@ -43,4 +45,8 @@ DROP TABLE table_1; 
DROP TABLE table_2;

DROP TABLE table_3;

DROP TABLE table_4;

"Checking for multiple executions in one second, should not happen -> 0 as result"

SELECT COUNT(*) FROM (SELECT s1, COUNT(*) AS cnt FROM T19170 GROUP BY s1) AS tmp WHERE tmp.cnt > 1;

COUNT(*)

0

DROP DATABASE events_test;

mysql-test/r/func_compress.result

+7 −0
Original line number Diff line number Diff line
@@ -72,3 +72,10 @@ set @@max_allowed_packet=1048576*100; 
select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;

compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null

0

create table t1(a blob);

insert into t1 values(NULL), (compress('a'));

select uncompress(a), uncompressed_length(a) from t1;

uncompress(a)	uncompressed_length(a)

NULL	NULL

a	1

drop table t1;