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

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

into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new


sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
parents 5529b7fb ac4b6623

mysql-test/r/events.result

+24 −39
Original line number Diff line number Diff line
@@ -38,52 +38,37 @@ drop event event2; 
create event event2 on schedule every 2 second starts now() ends date_add(now(), interval 5 hour) comment "some" DO begin end;

drop event event2;

CREATE EVENT event_starts_test ON SCHEDULE EVERY 10 SECOND COMMENT "" DO SELECT 1;

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	RECURRING	NULL	10	SECOND	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

0	1	

SELECT interval_field, interval_value, body FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

interval_field	interval_value	body

SECOND	10	SELECT 1

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

1	0	1	

ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02';

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	ONE TIME	2020-02-02 17:00:02	NULL	NULL	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

1	1	

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

0	1	1	

ALTER EVENT event_starts_test COMMENT "non-empty comment";

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	ONE TIME	2020-02-02 17:00:02	NULL	NULL	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

1	1	non-empty comment

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

0	1	1	non-empty comment

ALTER EVENT event_starts_test COMMENT "";

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	ONE TIME	2020-02-02 17:00:02	NULL	NULL	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

1	1	

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

0	1	1	

DROP EVENT event_starts_test;

CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '2020-02-02 20:00:02' ENDS '2022-02-02 20:00:02' DO SELECT 2;

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

0	0	

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

1	0	0	

ALTER EVENT event_starts_test COMMENT "non-empty comment";

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

SELECT starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

starts IS NULL	ends IS NULL	comment

0	0	non-empty comment

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

1	0	0	non-empty comment

ALTER EVENT event_starts_test COMMENT "";

SHOW EVENTS;

Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test';

execute_at IS NULL	starts IS NULL	ends IS NULL	comment

1	0	0	

DROP EVENT event_starts_test;

create table test_nested(a int);

create event e_43 on schedule every 1 second do set @a = 5;

mysql-test/r/events_bugs.result

+13 −0
Original line number Diff line number Diff line
@@ -213,4 +213,17 @@ create event e_53 on schedule every 5 second starts (select s1 from ttx) do drop 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select s1 from ttx) do drop table t' at line 1

create event e_53 on schedule every 5 second ends (select s1 from ttx) do drop table t;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select s1 from ttx) do drop table t' at line 1

drop event if exists e_16;

drop procedure if exists p_16;

create event e_16 on schedule every 1 second do set @a=5;

create procedure p_16 () alter event e_16 on schedule every @a second;

set @a = null;

call p_16();

ERROR HY000: Incorrect INTERVAL value: 'NULL'

call p_16();

ERROR HY000: Incorrect INTERVAL value: 'NULL'

set @a= 6;

call p_16();

drop procedure p_16;

drop event e_16;

drop database events_test;

mysql-test/r/events_restart_phase0.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
SHOW VARIABLES LIKE 'event%';

Variable_name	Value

event_scheduler	DISABLED

SELECT @@global.event_scheduler;

@@global.event_scheduler

DISABLED

SET GLOBAL event_scheduler=on;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=off;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=0;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=1;

ERROR HY000: The MySQL server is running with the --event-scheduler=DISABLED option so it cannot execute this statement

SET GLOBAL event_scheduler=2;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of '2'

SET GLOBAL event_scheduler=SUSPEND;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPEND'

SET GLOBAL event_scheduler=SUSPENDED;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'SUSPENDED'

SET GLOBAL event_scheduler=disabled;

ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'

mysql-test/r/log_tables.result

+9 −9
Original line number Diff line number Diff line
@@ -73,16 +73,16 @@ select * from mysql.slow_log; 
start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text

TIMESTAMP	USER_HOST	QUERY_TIME	00:00:00	1	0	test	0	0	1	select sleep(2)

alter table mysql.general_log engine=myisam;

ERROR HY000: You can't alter a log table if logging is enabled

ERROR HY000: You cannot 'ALTER' a log table if logging is enabled

alter table mysql.slow_log engine=myisam;

ERROR HY000: You can't alter a log table if logging is enabled

ERROR HY000: You cannot 'ALTER' a log table if logging is enabled

drop table mysql.general_log;

ERROR HY000: Cannot drop log table if log is enabled

ERROR HY000: You cannot 'DROP' a log table if logging is enabled

drop table mysql.slow_log;

ERROR HY000: Cannot drop log table if log is enabled

ERROR HY000: You cannot 'DROP' a log table if logging is enabled

set global general_log='OFF';

alter table mysql.slow_log engine=myisam;

ERROR HY000: You can't alter a log table if logging is enabled

ERROR HY000: You cannot 'ALTER' a log table if logging is enabled

set global slow_query_log='OFF';

show create table mysql.general_log;

Table	Create Table
@@ -173,13 +173,13 @@ unlock tables; 
set global general_log='OFF';

set global slow_query_log='OFF';

alter table mysql.slow_log engine=ndb;

ERROR HY000: One can use only CSV and MyISAM engines for the log tables

ERROR HY000: This storage engine cannot be used for log tables"

alter table mysql.slow_log engine=innodb;

ERROR HY000: One can use only CSV and MyISAM engines for the log tables

ERROR HY000: This storage engine cannot be used for log tables"

alter table mysql.slow_log engine=archive;

ERROR HY000: One can use only CSV and MyISAM engines for the log tables

ERROR HY000: This storage engine cannot be used for log tables"

alter table mysql.slow_log engine=blackhole;

ERROR HY000: One can use only CSV and MyISAM engines for the log tables

ERROR HY000: This storage engine cannot be used for log tables"

drop table mysql.slow_log;

drop table mysql.general_log;

drop table mysql.general_log;

mysql-test/r/sp.result

+8 −0
Original line number Diff line number Diff line
@@ -5379,6 +5379,14 @@ Procedure sql_mode Create Procedure 
bug21416		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug21416`()

show create procedure bug21416

drop procedure bug21416|

DROP PROCEDURE IF EXISTS bug21414|

CREATE PROCEDURE bug21414() SELECT 1|

FLUSH TABLES WITH READ LOCK|

DROP PROCEDURE bug21414|

ERROR HY000: Can't execute the query because you have a conflicting read lock

UNLOCK TABLES|

The following should succeed.

DROP PROCEDURE bug21414|

CREATE TABLE t3 (

Member_ID varchar(15) NOT NULL,

PRIMARY KEY (Member_ID)