Commit 8bbbff63 authored by unknown's avatar unknown
Browse files

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 18bddf14 a0c4e184

include/mysql_h.ic

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ extern TYPELIB * copy_typelib(MEM_ROOT * root, TYPELIB * from); 
# 415 "mysql_com.h"

extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st);

# 30 "typelib.h"

extern int find_type(char * x, TYPELIB * typelib, unsigned int);

extern int find_type(char * x, const TYPELIB * typelib, unsigned int);

# 429 "mysql_com.h"

extern void get_salt_from_password(unsigned char * res, char const * password);

# 422 "mysql_com.h"

include/typelib.h

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ typedef struct st_typelib { /* Different types saved here */ 
  unsigned int *type_lengths;

} TYPELIB;



extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);

extern int find_type(char *x, const TYPELIB *typelib,

                     unsigned int full_name);

extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);

extern const char *get_type(TYPELIB *typelib,unsigned int nr);

extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);

mysql-test/r/events.result

+9 −9
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ DROP EVENT event_starts_test; 
create table test_nested(a int);

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

alter event e_43 do alter event e_43 do set @a = 4;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present

alter event e_43 do

begin

alter event e_43 on schedule every 5 minute;
@@ -229,10 +229,10 @@ Db Name Definer Time zone Type Execute at Interval value Interval field Starts E 
events_test	intact_check	root@localhost	SYSTEM	RECURRING	NULL	10	#	#	NULL	ENABLED	1

ALTER TABLE mysql.event ADD dummy INT FIRST;

SHOW EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 19. Table probably corrupted

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 19. The table is probably corrupted

ALTER TABLE mysql.event DROP dummy, ADD dummy2 VARCHAR(64) FIRST;

SHOW EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 19. Table probably corrupted

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 19. The table is probably corrupted

ALTER TABLE mysql.event DROP dummy2;

SHOW EVENTS;

Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator
@@ -241,7 +241,7 @@ 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.

ERROR HY000: Cannot load from mysql.event. The table is probably corrupted. Please see the error log for details

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

SHOW CREATE TABLE mysql.event;

Table	Create Table
@@ -267,7 +267,7 @@ event CREATE TABLE `event` ( 
  PRIMARY KEY (`db`,`name`)

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

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

ERROR HY000: Cannot load from mysql.event. The table is probably corrupted. Please see the error log for details

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

"This should work"

SHOW EVENTS;
@@ -275,13 +275,13 @@ Db Name Definer Time zone Type Execute at Interval value Interval field Starts E 
events_test	intact_check	root@localhost	SYSTEM	RECURRING	NULL	10	#	#	NULL	ENABLED	1

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.

ERROR HY000: Cannot load from mysql.event. The table is probably corrupted. Please see the error log for details

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

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

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

ERROR HY000: Cannot load from mysql.event. The table is probably corrupted. Please see the error log for details

ALTER TABLE mysql.event DROP comment, DROP starts;

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 16. Table probably corrupted

ERROR HY000: Column count of mysql.event is wrong. Expected 18, found 16. The table is probably corrupted

DROP TABLE mysql.event;

CREATE TABLE mysql.event like event_like;

INSERT INTO  mysql.event SELECT * FROM event_like;
@@ -368,7 +368,7 @@ root localhost events_test Connect User lock select get_lock("test_lock2_1", 20) 
drop event закачка21;

create table t_16 (s1 int);

create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present

drop table t_16;

create event white_space

on schedule every 10 hour

mysql-test/r/events_bugs.result

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ DROP EVENT ДОЛЕН_регистър_утф8; 
SET NAMES latin1;

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

ERROR HY000: Recursion of EVENT DDL statements is forbidden when body is present

create event e_55 on schedule at 99990101000000 do drop table t;

ERROR HY000: Incorrect AT value: '99990101000000'

create event e_55 on schedule every 10 hour starts 99990101000000 do drop table t;

mysql-test/r/events_restart_phase0.result

deleted100644 → 0
+0 −22
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'