Commit b3096c69 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-aid


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents bb7c0246 e568bb05

mysql-test/lib/mtr_process.pl

+2 −3
Original line number Diff line number Diff line
@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () { 


        if ( kill(0, @pids) )           # Check if some left

        {

          # FIXME maybe just mtr_warning() ?

          mtr_error("can't kill process(es) " . join(" ", @pids));

          mtr_warning("can't kill process(es) " . join(" ", @pids));

        }

      }

    }
@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () { 
  {

    if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) )

    {

      mtr_error("can't kill old mysqld holding port $srv->{'port'}");

      mtr_warning("can't kill old mysqld holding port $srv->{'port'}");

    }

  }

}

mysql-test/r/ctype_ucs.result

+8 −0
Original line number Diff line number Diff line
@@ -719,3 +719,11 @@ lily 
river

drop table t1;

deallocate prepare stmt;

create table t1(a blob, b text charset utf8, c text charset ucs2);

select data_type, character_octet_length, character_maximum_length

from information_schema.columns where table_name='t1';

data_type	character_octet_length	character_maximum_length

blob	65535	65535

text	65535	65535

text	65535	32767

drop table t1;

mysql-test/r/events.result

+3 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ drop event if exists event3; 
Warnings:

Note	1305	Event event3 does not exist

create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());

set max_allowed_packet=128000000;

select count(*) from t_event3;

count(*)

0
@@ -232,6 +231,9 @@ Db Name Definer Type Execute at Interval value Interval field Starts Ends Status 
events_test	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED

CREATE TABLE event_like LIKE mysql.event;

INSERT INTO event_like SELECT * FROM mysql.event;

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.

ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin default '';

SHOW CREATE TABLE mysql.event;

Table	Create Table

mysql-test/r/events_scheduling.result

0 → 100644
+46 −0
Original line number Diff line number Diff line 
CREATE DATABASE IF NOT EXISTS events_test;

USE events_test;

CREATE TABLE table_1(a int);

CREATE TABLE table_2(a int);

CREATE TABLE table_3(a int);

CREATE TABLE table_4(a int);

SET GLOBAL event_scheduler=1;

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

ENDS NOW() + INTERVAL 6 SECOND

ON COMPLETION PRESERVE

DO INSERT INTO table_2 VALUES(1);

CREATE EVENT only_one_time ON SCHEDULE EVERY 2 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_3 VALUES(1);

CREATE EVENT two_time ON SCHEDULE EVERY 1 SECOND ENDS NOW() + INTERVAL 1 SECOND DO INSERT INTO table_4 VALUES(1);

SELECT IF(SUM(a) >= 4, 'OK', 'ERROR') FROM table_1;

IF(SUM(a) >= 4, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >= 5, 'OK', 'ERROR') FROM table_2;

IF(SUM(a) >= 5, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_3;

IF(SUM(a) >  0, 'OK', 'ERROR')

OK

SELECT IF(SUM(a) >  0, 'OK', 'ERROR') FROM table_4;

IF(SUM(a) >  0, 'OK', 'ERROR')

OK

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')

OK

DROP EVENT start_n_end;

"Already dropped because ended. Therefore an error."

DROP EVENT only_one_time;

ERROR HY000: Unknown event 'only_one_time'

"Already dropped because ended. Therefore an error."

DROP EVENT two_time;

ERROR HY000: Unknown event 'two_time'

DROP TABLE table_1;

DROP TABLE table_2;

DROP TABLE table_3;

DROP TABLE table_4;

DROP DATABASE events_test;

mysql-test/r/func_gconcat.result

+5 −0
Original line number Diff line number Diff line
@@ -626,3 +626,8 @@ latin1 
latin1

drop table t1, t2, t3;

set names default;

create table t1 (c1 varchar(10), c2 int);

select charset(group_concat(c1 order by c2)) from t1;

charset(group_concat(c1 order by c2))

latin1

drop table t1;