Commit a4cf3861 authored by unknown's avatar unknown
Browse files

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

into  ibmlab.site:/home/my/bk/mysql-5.1-new
parents 6dbb6cf1 bf3501a5

client/cmakelists.txt

+9 −9
Original line number Diff line number Diff line
@@ -51,30 +51,30 @@ ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 
ADD_DEPENDENCIES(mysqlclient GenError)

ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)

LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl zlib dbug yassl  taocrypt wsock32)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl taocrypt zlib dbug wsock32)



ADD_EXECUTABLE(mysqltest mysqltest.c)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl zlib dbug regex wsock32)

TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl taocrypt zlib dbug regex wsock32)



ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)

TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlimport mysqlimport.c)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlshow mysqlshow.c)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc

                           ../mysys/my_bit.c ../mysys/my_bitmap.c ../mysys/my_vle.c

                           ../mysys/base64.c)

TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqladmin mysqladmin.cc)

TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)

TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlslap mysqlslap.c)

TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32 dbug)
 
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys yassl taocrypt zlib wsock32 dbug)

libmysql/cmakelists.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def 
                     ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 

                     ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 

                     ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)

ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib)

ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib yassl taocrypt)

TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)



# ToDo: We should move the mytest.c program out in libmysql/

mysql-test/r/events.result

+22 −20
Original line number Diff line number Diff line
@@ -116,80 +116,80 @@ set names utf8; 
CREATE EVENT root6 ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1;

SHOW CREATE EVENT root6;

Event	sql_mode	Create Event

root6		CREATE EVENT `events_test`.`root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1

root6		CREATE EVENT `root6` ON SCHEDULE EVERY '10:20' MINUTE_SECOND ON COMPLETION PRESERVE ENABLE COMMENT 'some comment' DO select 1

create event root7 on schedule every 2 year do select 1;

SHOW CREATE EVENT root7;

Event	sql_mode	Create Event

root7		CREATE EVENT `events_test`.`root7` ON SCHEDULE EVERY 2 YEAR ON COMPLETION NOT PRESERVE ENABLE DO select 1

root7		CREATE EVENT `root7` ON SCHEDULE EVERY 2 YEAR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root8 on schedule every '2:5' year_month do select 1;

SHOW CREATE EVENT root8;

Event	sql_mode	Create Event

root8		CREATE EVENT `events_test`.`root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

root8		CREATE EVENT `root8` ON SCHEDULE EVERY '2-5' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root8_1 on schedule every '2:15' year_month do select 1;

SHOW CREATE EVENT root8_1;

Event	sql_mode	Create Event

root8_1		CREATE EVENT `events_test`.`root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

root8_1		CREATE EVENT `root8_1` ON SCHEDULE EVERY '3-3' YEAR_MONTH ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root9 on schedule every 2 week ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' do select 1;

SHOW CREATE EVENT root9;

Event	sql_mode	Create Event

root9		CREATE EVENT `events_test`.`root9` ON SCHEDULE EVERY 2 WEEK ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1

root9		CREATE EVENT `root9` ON SCHEDULE EVERY 2 WEEK ON COMPLETION PRESERVE DISABLE COMMENT 'коментар на кирилица' DO select 1

create event root10 on schedule every '20:5' day_hour do select 1;

SHOW CREATE EVENT root10;

Event	sql_mode	Create Event

root10		CREATE EVENT `events_test`.`root10` ON SCHEDULE EVERY '20 5' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

root10		CREATE EVENT `root10` ON SCHEDULE EVERY '20 5' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root11 on schedule every '20:25' day_hour do select 1;

SHOW CREATE EVENT root11;

Event	sql_mode	Create Event

root11		CREATE EVENT `events_test`.`root11` ON SCHEDULE EVERY '21 1' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

root11		CREATE EVENT `root11` ON SCHEDULE EVERY '21 1' DAY_HOUR ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root12 on schedule every '20:25' hour_minute do select 1;

SHOW CREATE EVENT root12;

Event	sql_mode	Create Event

root12		CREATE EVENT `events_test`.`root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root12		CREATE EVENT `root12` ON SCHEDULE EVERY '20:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root13 on schedule every '25:25' hour_minute do select 1;

SHOW CREATE EVENT root13;

Event	sql_mode	Create Event

root13		CREATE EVENT `events_test`.`root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root13		CREATE EVENT `root13` ON SCHEDULE EVERY '25:25' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root13_1 on schedule every '11:65' hour_minute do select 1;

SHOW CREATE EVENT root13_1;

Event	sql_mode	Create Event

root13_1		CREATE EVENT `events_test`.`root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root13_1		CREATE EVENT `root13_1` ON SCHEDULE EVERY '12:5' HOUR_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root14 on schedule every '35:35' minute_second do select 1;

SHOW CREATE EVENT root14;

Event	sql_mode	Create Event

root14		CREATE EVENT `events_test`.`root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

root14		CREATE EVENT `root14` ON SCHEDULE EVERY '35:35' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root15 on schedule every '35:66' minute_second do select 1;

SHOW CREATE EVENT root15;

Event	sql_mode	Create Event

root15		CREATE EVENT `events_test`.`root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

root15		CREATE EVENT `root15` ON SCHEDULE EVERY '36:6' MINUTE_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root16 on schedule every '35:56' day_minute do select 1;

SHOW CREATE EVENT root16;

Event	sql_mode	Create Event

root16		CREATE EVENT `events_test`.`root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root16		CREATE EVENT `root16` ON SCHEDULE EVERY '1 11:56' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root17 on schedule every '35:12:45' day_minute do select 1;

SHOW CREATE EVENT root17;

Event	sql_mode	Create Event

root17		CREATE EVENT `events_test`.`root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root17		CREATE EVENT `root17` ON SCHEDULE EVERY '35 12:45' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root17_1 on schedule every '35:25:65' day_minute do select 1;

SHOW CREATE EVENT root17_1;

Event	sql_mode	Create Event

root17_1		CREATE EVENT `events_test`.`root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

root17_1		CREATE EVENT `root17_1` ON SCHEDULE EVERY '36 2:5' DAY_MINUTE ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root18 on schedule every '35:12:45' hour_second do select 1;

SHOW CREATE EVENT root18;

Event	sql_mode	Create Event

root18		CREATE EVENT `events_test`.`root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

root18		CREATE EVENT `root18` ON SCHEDULE EVERY '35:12:45' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root19 on schedule every '15:59:85' hour_second do select 1;

SHOW CREATE EVENT root19;

Event	sql_mode	Create Event

root19		CREATE EVENT `events_test`.`root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

root19		CREATE EVENT `root19` ON SCHEDULE EVERY '16:0:25' HOUR_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

create event root20 on schedule every '50:20:12:45' day_second do select 1;

SHOW CREATE EVENT root20;

Event	sql_mode	Create Event

root20		CREATE EVENT `events_test`.`root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

root20		CREATE EVENT `root20` ON SCHEDULE EVERY '50 20:12:45' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE DO select 1

set names cp1251;

create event ðóóò21 on schedule every '50:23:59:95' day_second COMMENT 'òîâà å 1251 êîìåíòàð' do select 1;

SHOW CREATE EVENT ðóóò21;

Event	sql_mode	Create Event

ðóóò21		CREATE EVENT `events_test`.`ðóóò21` ON SCHEDULE EVERY '51 0:0:35' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE COMMENT 'òîâà å 1251 êîìåíòàð' DO select 1

ðóóò21		CREATE EVENT `ðóóò21` ON SCHEDULE EVERY '51 0:0:35' DAY_SECOND ON COMPLETION NOT PRESERVE ENABLE COMMENT 'òîâà å 1251 êîìåíòàð' DO select 1

insert into mysql.event (db, name, body, definer, interval_value, interval_field) values (database(), "root22", "select 1", user(), 100, "SECOND_MICROSECOND");

show create event root22;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'
@@ -262,6 +262,8 @@ SHOW EVENTS; 
Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test                                                 	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED

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

Warnings:

Warning	1265	Data truncated for column 'db' at row 1

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 varchar(64) character set utf8 collate utf8_bin default '';

mysql-test/r/events_bugs.result

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ CALL p_16(); 
ERROR HY000: Event 'e_16' already exists

DROP PROCEDURE p_16;

DROP EVENT e_16;

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;

ERROR HY000: Incorrect STARTS value: '99990101000000'

create event e_55 on schedule every 10 minute ends 99990101000000 do drop table t;

ERROR HY000: ENDS is either invalid or before STARTS

set global event_scheduler=0;

"Wait a bit to settle down"

delete from mysql.event;

mysql-test/t/events.test

+8 −8
Original line number Diff line number Diff line
@@ -190,10 +190,10 @@ CREATE EVENT intact_check ON SCHEDULE EVERY 10 HOUR DO SELECT "nothing"; 
--replace_column 8 # 9 #

SHOW EVENTS;

ALTER TABLE mysql.event ADD dummy INT FIRST;

--error 1525

--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED

SHOW EVENTS;

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

--error 1525

--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED

SHOW EVENTS;

ALTER TABLE mysql.event DROP dummy2;

--replace_column 8 # 9 #
@@ -206,7 +206,7 @@ ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin d 
#wait a bit or we won't see the difference because of seconds resolution

--sleep 1

SHOW CREATE TABLE mysql.event;

--error 1526

--error ER_CANNOT_LOAD_FROM_TABLE

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

ALTER TABLE mysql.event MODIFY db char(64) character set utf8 collate utf8_bin default '';
@@ -216,16 +216,16 @@ ALTER TABLE mysql.event MODIFY db char(64) character set utf8 collate utf8_bin d 
SHOW EVENTS;

--sleep 1

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

--error 1526

--error ER_CANNOT_LOAD_FROM_TABLE

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

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

--error 1526

--error ER_CANNOT_LOAD_FROM_TABLE

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

--sleep 1

ALTER TABLE mysql.event DROP comment, DROP starts;

--sleep 1

--error 1525

--error ER_COL_COUNT_DOESNT_MATCH_CORRUPTED

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

DROP TABLE mysql.event;

CREATE TABLE mysql.event like event_like;
@@ -317,9 +317,9 @@ drop event one_event; 
create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;

select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;

drop event e_26;

--error 1503

--error 1504

create event e_26 on schedule at NULL disabled do set @a = 5;

--error 1503

--error 1504

create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;



set names utf8;