diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 14:13:46 +0200 |
| commit | 1933cf98e842f97e11f69afc631638618ec16068 (patch) | |
| tree | 446b8ff1ac09234b99d71ff06b75961c43247083 | |
| parent | 137812c88a418479c7d637f4075712d9f6c6c82f (diff) | |
| parent | e8907112790475772b3e5135b58ef95b3fd8ea68 (diff) | |
| download | mariadb-git-1933cf98e842f97e11f69afc631638618ec16068.tar.gz | |
Merge 5.5 into 10.0bb-10.0-merge
28 files changed, 423 insertions, 371 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index e3c0bb30098..4b4a4b8a917 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3788,9 +3788,10 @@ print_table_data_html(MYSQL_RES *result) MYSQL_FIELD *field; mysql_field_seek(result,0); - (void) tee_fputs("<TABLE BORDER=1><TR>", PAGER); + (void) tee_fputs("<TABLE BORDER=1>", PAGER); if (column_names) { + (void) tee_fputs("<TR>", PAGER); while((field = mysql_fetch_field(result))) { tee_fputs("<TH>", PAGER); diff --git a/mysql-test/include/mix2.inc b/mysql-test/include/mix2.inc index d6becb2e37e..4d688ddb347 100644 --- a/mysql-test/include/mix2.inc +++ b/mysql-test/include/mix2.inc @@ -1153,7 +1153,7 @@ checksum table t1, t2, t3, t4, t5, t6, t7 extended; drop table t1,t2,t3, t4, t5, t6; # -# Test problem with refering to different fields in same table in UNION +# Test problem with referring to different fields in same table in UNION # (Bug#2552: UNION returns NULL instead of expected value (innoDB only tables)) # eval create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=$engine_type; diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/r/ddl_i18n_koi8r.result index fbed2ac1565..6f57d52eb3d 100644 --- a/mysql-test/r/ddl_i18n_koi8r.result +++ b/mysql-test/r/ddl_i18n_koi8r.result @@ -2174,7 +2174,7 @@ CREATE DATABASE mysqltest1 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unico CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci| use mysqltest1| -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); SELECT @@ -2186,7 +2186,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c4, @@character_set_client AS c6; END| -CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2198,7 +2198,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c4, @@character_set_client AS c6; END| -CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2210,7 +2210,7 @@ COLLATION(_utf8 'текÑÑ‚') AS c4, @@character_set_client AS c6; END| -CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2226,7 +2226,7 @@ END| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2239,7 +2239,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2252,7 +2252,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2265,7 +2265,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2279,11 +2279,11 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2303,7 +2303,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2316,7 +2316,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2329,7 +2329,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2342,7 +2342,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -2361,7 +2361,7 @@ set names koi8r| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2374,7 +2374,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2387,7 +2387,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2400,7 +2400,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2414,11 +2414,11 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2438,7 +2438,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2451,7 +2451,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2464,7 +2464,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2477,7 +2477,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci ---> Dump of mysqltest1 @@ -2497,7 +2497,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2525,7 +2525,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2564,7 +2564,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2592,7 +2592,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2634,7 +2634,7 @@ set names koi8r| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2647,7 +2647,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2660,7 +2660,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2673,7 +2673,7 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(ÐÅÒÅÍ1) AS c1, @@ -2687,11 +2687,11 @@ END koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 koi8r koi8r_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 koi8r koi8r_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2711,7 +2711,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2724,7 +2724,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2737,7 +2737,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2750,7 +2750,7 @@ COLLATION( 'ÔÅËÓÔ') AS c3, COLLATION( 'ÔÅËÓÔ') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 koi8r koi8r_general_ci utf8_unicode_ci ------------------------------------------------------------------- DDL statements within stored routine. diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/r/ddl_i18n_utf8.result index 98da459dafc..19ae7f06e99 100644 --- a/mysql-test/r/ddl_i18n_utf8.result +++ b/mysql-test/r/ddl_i18n_utf8.result @@ -2174,7 +2174,7 @@ CREATE DATABASE mysqltest1 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unico CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci| use mysqltest1| -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); SELECT @@ -2186,7 +2186,7 @@ COLLATION(_koi8r 'ÔÅËÓÔ') AS c4, @@character_set_client AS c6; END| -CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2198,7 +2198,7 @@ COLLATION(_koi8r 'ÔÅËÓÔ') AS c4, @@character_set_client AS c6; END| -CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2210,7 +2210,7 @@ COLLATION(_koi8r 'ÔÅËÓÔ') AS c4, @@character_set_client AS c6; END| -CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT @@ -2226,7 +2226,7 @@ END| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); SELECT COLLATION(перем1) AS c1, @@ -2239,7 +2239,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2252,7 +2252,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2265,7 +2265,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2279,11 +2279,11 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2303,7 +2303,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2316,7 +2316,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2329,7 +2329,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2342,7 +2342,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -2361,7 +2361,7 @@ set names utf8| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); SELECT COLLATION(перем1) AS c1, @@ -2374,7 +2374,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2387,7 +2387,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2400,7 +2400,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2414,11 +2414,11 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2438,7 +2438,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2451,7 +2451,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2464,7 +2464,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2477,7 +2477,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci ---> Dump of mysqltest1 @@ -2497,7 +2497,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); SELECT COLLATION(перем1) AS c1, @@ -2525,7 +2525,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2564,7 +2564,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2592,7 +2592,7 @@ ALTER DATABASE `mysqltest2` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;; /*!50003 SET sql_mode = '' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +/*!50106 CREATE*/ /*!50117 DEFINER=`root`@`localhost`*/ /*!50106 EVENT `ev4` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2634,7 +2634,7 @@ set names utf8| SHOW CREATE EVENT ev1| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); SELECT COLLATION(перем1) AS c1, @@ -2647,7 +2647,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT ev2| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev2 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev2` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2660,7 +2660,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2673,7 +2673,7 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW CREATE EVENT mysqltest2.ev3| Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN +ev3 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev3` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; SELECT COLLATION(перем1) AS c1, @@ -2687,11 +2687,11 @@ END utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev1'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev1 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev1 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev2'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation -mysqltest1 ev2 root@localhost SYSTEM ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED 1 utf8 utf8_general_ci utf8_unicode_ci +mysqltest1 ev2 root@localhost SYSTEM ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED 1 utf8 utf8_general_ci utf8_unicode_ci SHOW EVENTS LIKE 'ev3'| Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation @@ -2711,7 +2711,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev2'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2724,7 +2724,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev3'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2737,7 +2737,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci SELECT * FROM INFORMATION_SCHEMA.EVENTS WHERE event_name = 'ev4'| EVENT_CATALOG EVENT_SCHEMA EVENT_NAME DEFINER TIME_ZONE EVENT_BODY EVENT_DEFINITION EVENT_TYPE EXECUTE_AT INTERVAL_VALUE INTERVAL_FIELD SQL_MODE STARTS ENDS STATUS ON_COMPLETION CREATED LAST_ALTERED LAST_EXECUTED EVENT_COMMENT ORIGINATOR CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION @@ -2750,7 +2750,7 @@ COLLATION( 'текÑÑ‚') AS c3, COLLATION( 'текÑÑ‚') AS c4, @@collation_connection AS c5, @@character_set_client AS c6; -END ONE TIME 2030-01-01 00:00:00 NULL NULL NULL NULL ENABLED NOT PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci +END ONE TIME 1970-01-02 00:00:00 NULL NULL NULL NULL DISABLED PRESERVE CREATED LAST_ALTERED NULL 1 utf8 utf8_general_ci utf8_unicode_ci ------------------------------------------------------------------- DDL statements within stored routine. diff --git a/mysql-test/r/events_1.result b/mysql-test/r/events_1.result index 4e7ff526eca..93703109e10 100644 --- a/mysql-test/r/events_1.result +++ b/mysql-test/r/events_1.result @@ -49,7 +49,7 @@ 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'; +ALTER EVENT event_starts_test ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE; 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 @@ -62,7 +62,7 @@ SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.even 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; +CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '1970-01-02 00:00:00' ENDS '1970-01-03 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 2; 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 diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index ffa5d020153..d23c7965af4 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -613,3 +613,7 @@ count(*) 0 truncate table t1; drop table t1; +# +# MDEV-15538 '-N' Produce html output wrong +# +<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE>
\ No newline at end of file diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 5669e0bcbde..b78f9fe30d3 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1424,7 +1424,7 @@ CREATE TABLE t1(c1 CHAR(10)); CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET NEW.c1 = 'ÔÅÓÔ'; -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT 'ÔÅÓÔ' AS test; +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 'ÔÅÓÔ' AS test; set names utf8; SHOW CREATE VIEW v1; View Create View character_set_client collation_connection @@ -1444,7 +1444,7 @@ FOR EACH ROW SET NEW.c1 = 'теÑÑ‚' koi8r koi8r_general_ci latin1_swedish_ci SHOW CREATE EVENT ev1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation -ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '2030-01-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO SELECT 'теÑÑ‚' AS test koi8r koi8r_general_ci latin1_swedish_ci +ev1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `ev1` ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 'теÑÑ‚' AS test koi8r koi8r_general_ci latin1_swedish_ci DROP VIEW v1; DROP PROCEDURE p1; DROP FUNCTION f1; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result index 7581a9a7cad..c117c071ecd 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result @@ -1,7 +1,7 @@ drop table if exists t1; -reset master; -set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22"); +set @a=UNIX_TIMESTAMP("1970-01-21 15:32:22"); set timestamp=@a; +reset master; create table t1 (a int auto_increment not null primary key, b char(3)); insert into t1 values(null, "a"); insert into t1 values(null, "b"); @@ -21,7 +21,7 @@ insert into t1 values(null, "f"); DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -35,46 +35,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -93,7 +93,7 @@ BEGIN /*!*/; SET INSERT_ID=1/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -104,43 +104,43 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -159,7 +159,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -170,25 +170,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -204,7 +204,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -218,19 +218,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -249,7 +249,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -276,7 +276,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -287,25 +287,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -321,7 +321,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -335,19 +335,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -364,7 +364,7 @@ flush logs; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -378,46 +378,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -426,7 +426,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -437,7 +437,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -456,7 +456,7 @@ BEGIN /*!*/; SET INSERT_ID=1/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -467,43 +467,43 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -512,7 +512,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -523,7 +523,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -542,7 +542,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -553,25 +553,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -580,7 +580,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -591,7 +591,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -607,7 +607,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -621,46 +621,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -683,7 +683,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -694,25 +694,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -721,7 +721,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -732,7 +732,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -748,7 +748,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -762,19 +762,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -790,7 +790,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -804,46 +804,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -862,7 +862,7 @@ BEGIN /*!*/; SET INSERT_ID=1/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -873,43 +873,43 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -927,7 +927,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -938,25 +938,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -972,7 +972,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -986,19 +986,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1016,7 +1016,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1043,7 +1043,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1054,25 +1054,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1088,7 +1088,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1102,19 +1102,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1130,7 +1130,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1144,46 +1144,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1192,7 +1192,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1203,7 +1203,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1222,7 +1222,7 @@ BEGIN /*!*/; SET INSERT_ID=1/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1233,43 +1233,43 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1278,7 +1278,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1289,7 +1289,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1307,7 +1307,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1318,25 +1318,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1345,7 +1345,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1356,7 +1356,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1372,7 +1372,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1386,46 +1386,46 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1446,7 +1446,7 @@ BEGIN /*!*/; SET INSERT_ID=3/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1457,25 +1457,25 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1484,7 +1484,7 @@ BEGIN /*!*/; SET INSERT_ID=6/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1495,7 +1495,7 @@ SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1511,7 +1511,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1525,19 +1525,19 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; DELIMITER ; @@ -1553,7 +1553,7 @@ ROLLBACK /* added by mysqlbinlog */; DELIMITER /*!*/; ROLLBACK/*!*/; use `test`/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/; SET @@session.sql_mode=0/*!*/; @@ -1567,55 +1567,55 @@ create table t1 (a int auto_increment not null primary key, b char(3)) BEGIN /*!*/; SET INSERT_ID=1/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "a") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=2/*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; insert into t1 values(null, "b") /*!*/; -SET TIMESTAMP=1579609942/*!*/; +SET TIMESTAMP=1773142/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=3/*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; insert into t1 values(null, "c") /*!*/; -SET TIMESTAMP=1579609944/*!*/; +SET TIMESTAMP=1773144/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=4/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "d") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=5/*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; insert into t1 values(null, "e") /*!*/; -SET TIMESTAMP=1579609946/*!*/; +SET TIMESTAMP=1773146/*!*/; COMMIT /*!*/; BEGIN /*!*/; SET INSERT_ID=6/*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; insert into t1 values(null, "f") /*!*/; -SET TIMESTAMP=1579609943/*!*/; +SET TIMESTAMP=1773143/*!*/; COMMIT /*!*/; DELIMITER ; diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test index 367314d9643..b26dcc3f4af 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test @@ -8,15 +8,15 @@ --disable_warnings drop table if exists t1; --enable_warnings -reset master; # We need this for getting fixed timestamps inside of this test. -# I use a date in the future to keep a growing timestamp along the +# I use a date in the past to keep a growing timestamp along the # binlog (including the Start_log_event). This test will work # unchanged everywhere, because mysql-test-run has fixed TZ, which it # exports (so mysqlbinlog has same fixed TZ). -set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22"); +set @a=UNIX_TIMESTAMP("1970-01-21 15:32:22"); set timestamp=@a; +reset master; create table t1 (a int auto_increment not null primary key, b char(3)); insert into t1 values(null, "a"); insert into t1 values(null, "b"); @@ -70,11 +70,11 @@ let $stop_pos= `select @binlog_start_pos + 857`; --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 --disable_query_log select "--- Local with 2 binlogs on command line --" as ""; @@ -102,11 +102,11 @@ let $stop_pos= `select @binlog_start_pos + 134`; --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 --disable_query_log select "--- Remote --" as ""; @@ -137,11 +137,11 @@ let $stop_pos= `select @binlog_start_pos + 812`; --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- Remote with 2 binlogs on command line --" as ""; @@ -166,11 +166,11 @@ let $stop_pos= `select @binlog_start_pos + 109`; --disable_query_log select "--- start-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--start-datetime=20200121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--start-datetime=19700121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- stop-datetime --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- to-last-log --" as ""; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index fc768ab197b..5dc0abc56b7 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1117,7 +1117,7 @@ checksum table t1, t2, t3, t4 extended; drop table t1,t2,t3; # -# Test problem with refering to different fields in same table in UNION +# Test problem with referring to different fields in same table in UNION # (Bug #2552) # create table t1 (id int, name char(10) not null, name2 char(10) not null) engine=innodb; diff --git a/mysql-test/suite/plugins/t/thread_pool_server_audit.test b/mysql-test/suite/plugins/t/thread_pool_server_audit.test index 724000c9789..7347d8f99ff 100644 --- a/mysql-test/suite/plugins/t/thread_pool_server_audit.test +++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test @@ -42,8 +42,10 @@ select 1, 3; insert into t2 values (1), (2); select * from t2; +--disable_ps_protocol --error ER_NO_SUCH_TABLE select * from t_doesnt_exist; +--enable_ps_protocol --error 1064 syntax_error_query; drop table renamed_t1, t2; diff --git a/mysql-test/suite/rpl/r/rpl_rewrt_db.result b/mysql-test/suite/rpl/r/rpl_rewrt_db.result index d9b6006fbb0..c22ec7af810 100644 --- a/mysql-test/suite/rpl/r/rpl_rewrt_db.result +++ b/mysql-test/suite/rpl/r/rpl_rewrt_db.result @@ -1,19 +1,36 @@ include/master-slave.inc [connection master] +set sql_log_bin=0; +create database y; +set sql_log_bin=1; drop database if exists mysqltest1; +drop database if exists x; create database mysqltest1; +set sql_log_bin=0; +create database x; +set sql_log_bin=1; use mysqltest1; create table t1 (a int); insert into t1 values(9); +use x; +create table t1 (a int); +insert into t1 values(9); select * from mysqltest1.t1; a 9 +select * from x.t1; +a +9 show databases like 'mysqltest1'; Database (mysqltest1) mysqltest1 select * from test.t1; a 9 +select * from y.t1; +a +9 +use mysqltest1; drop table t1; drop database mysqltest1; drop database if exists rewrite; @@ -215,10 +232,12 @@ SET sql_log_bin= 0; DROP DATABASE database_master_temp_01; DROP DATABASE database_master_temp_02; DROP DATABASE database_master_temp_03; +DROP DATABASE x; SET sql_log_bin= 1; SET sql_log_bin= 0; DROP DATABASE database_slave_temp_01; DROP DATABASE database_slave_temp_02; DROP DATABASE database_slave_temp_03; +DROP DATABASE y; SET sql_log_bin= 1; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt b/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt index 290b92e0a3e..84059110136 100644 --- a/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt @@ -1 +1 @@ -"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1->test" "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03" +"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1 -> test" "--replicate-rewrite-db=x -> y" "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03" diff --git a/mysql-test/suite/rpl/t/rpl_rewrt_db.test b/mysql-test/suite/rpl/t/rpl_rewrt_db.test index 996ad0a10c7..bd0749bc2de 100644 --- a/mysql-test/suite/rpl/t/rpl_rewrt_db.test +++ b/mysql-test/suite/rpl/t/rpl_rewrt_db.test @@ -2,20 +2,37 @@ -- source include/have_binlog_format_mixed_or_statement.inc -- source include/master-slave.inc +--connection slave +set sql_log_bin=0; +create database y; +set sql_log_bin=1; + +--connection master --disable_warnings drop database if exists mysqltest1; +drop database if exists x; --enable_warnings create database mysqltest1; +set sql_log_bin=0; +create database x; +set sql_log_bin=1; use mysqltest1; create table t1 (a int); insert into t1 values(9); +use x; +create table t1 (a int); +insert into t1 values(9); select * from mysqltest1.t1; +select * from x.t1; sync_slave_with_master; +#TODO no it is no empty show databases like 'mysqltest1'; # should be empty select * from test.t1; +select * from y.t1; # cleanup connection master; +use mysqltest1; drop table t1; drop database mysqltest1; sync_slave_with_master; @@ -224,6 +241,7 @@ SET sql_log_bin= 0; DROP DATABASE database_master_temp_01; DROP DATABASE database_master_temp_02; DROP DATABASE database_master_temp_03; +DROP DATABASE x; SET sql_log_bin= 1; connection slave; @@ -231,6 +249,7 @@ SET sql_log_bin= 0; DROP DATABASE database_slave_temp_01; DROP DATABASE database_slave_temp_02; DROP DATABASE database_slave_temp_03; +DROP DATABASE y; SET sql_log_bin= 1; connection master; diff --git a/mysql-test/suite/storage_engine/vcol.result b/mysql-test/suite/storage_engine/vcol.result index d51ab038576..24b54928dfc 100644 --- a/mysql-test/suite/storage_engine/vcol.result +++ b/mysql-test/suite/storage_engine/vcol.result @@ -7,8 +7,8 @@ b int(11) # # VIRTUAL INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored SELECT a,b FROM t1; a b 1 2 @@ -24,8 +24,8 @@ b int(11) # # PERSISTENT INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored SELECT a,b FROM t1; a b 1 2 @@ -41,8 +41,8 @@ b int(11) # # VIRTUAL INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored SELECT a,b FROM t1; a b 1 2 @@ -58,8 +58,8 @@ b int(11) # # PERSISTENT INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a,b) VALUES (3,3),(4,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored SELECT a,b FROM t1; a b 1 2 diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result index af03cc4d482..cc81fabe2f0 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols insert into t1 values (1,2,3); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against vcols insert into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -107,8 +107,8 @@ a b c create table t2 like t1; insert into t2 select * from t1; Warnings: -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'c' in table 't2' ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'c' in table 't2' has been ignored select * from t1; a b c 2 -2 -2 @@ -123,8 +123,8 @@ a b c create table t2 like t1; insert into t2 (a,b) select a,b from t1; Warnings: -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'b' in table 't2' ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored select * from t2; a b c 2 -2 -2 @@ -159,7 +159,7 @@ a b c 2 -2 -2 update t1 set c=3 where a=2; Warnings: -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -189,7 +189,7 @@ a b c 2 -2 -2 update t1 set c=3 where b=-2; Warnings: -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result index 351dfd2858c..eccf1199790 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result @@ -25,8 +25,8 @@ a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols insert into t1 values (1,2,3); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -65,8 +65,8 @@ a b c # against vcols insert into t1 (a,b) values (1,3), (2,4); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -107,8 +107,8 @@ a b c create table t2 like t1; insert into t2 select * from t1; Warnings: -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'c' in table 't2' ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'c' in table 't2' has been ignored select * from t1; a b c 2 -2 -2 @@ -123,8 +123,8 @@ a b c create table t2 like t1; insert into t2 (a,b) select a,b from t1; Warnings: -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'b' in table 't2' ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored select * from t2; a b c 2 -2 -2 @@ -159,7 +159,7 @@ a b c 2 -2 -2 update t1 set c=3 where a=2; Warnings: -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 @@ -189,7 +189,7 @@ a b c 2 -2 -2 update t1 set c=3 where b=-2; Warnings: -Warning 1906 The value specified for computed column 'c' in table 't1' ignored +Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored select * from t1; a b c 1 -1 -1 diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 92be94cbb81..51db575db8c 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -108,10 +108,10 @@ DROP TABLE t1,t2; CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL); INSERT INTO t1 VALUES (0,1,0); Warnings: -Warning 1906 The value specified for computed column 'v' in table 't1' ignored +Warning 1906 The value specified for computed column 'v' in table 't1' has been ignored INSERT INTO t1 VALUES (NULL,0,0); Warnings: -Warning 1906 The value specified for computed column 'v' in table 't1' ignored +Warning 1906 The value specified for computed column 'v' in table 't1' has been ignored SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1; a p v ROUND(a,p) ROUND(a,p+NULL) 1 0 1 1 NULL @@ -306,15 +306,15 @@ d varchar(5) latin1_swedish_ci YES NULL PERSISTENT # INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL); UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; Warnings: -Warning 1906 The value specified for computed column 'd' in table 't1' ignored +Warning 1906 The value specified for computed column 'd' in table 't1' has been ignored INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); Warnings: -Warning 1906 The value specified for computed column 'd' in table 't1' ignored +Warning 1906 The value specified for computed column 'd' in table 't1' has been ignored set sql_mode='strict_all_tables'; UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; -ERROR HY000: The value specified for computed column 'd' in table 't1' ignored +ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); -ERROR HY000: The value specified for computed column 'd' in table 't1' ignored +ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored drop table t1; # # MDEV-5611: self-referencing virtual column diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result index 6dee132b3e5..9e0259087c5 100644 --- a/mysql-test/suite/vcol/r/vcol_select_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result @@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154); CREATE TABLE t2 (a int, b int AS (a) VIRTUAL); INSERT INTO t2 VALUES (187,187), (9,9), (187,187); Warnings: -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'b' in table 't2' ignored -Warning 1906 The value specified for computed column 'b' in table 't2' ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored +Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored EXPLAIN EXTENDED SELECT * FROM t1 JOIN t2 USING (b); id select_type table type possible_keys key key_len ref rows filtered Extra diff --git a/mysql-test/t/ddl_i18n_koi8r.test b/mysql-test/t/ddl_i18n_koi8r.test index 40f8d07c55d..9b91823a454 100644 --- a/mysql-test/t/ddl_i18n_koi8r.test +++ b/mysql-test/t/ddl_i18n_koi8r.test @@ -821,7 +821,7 @@ use mysqltest1| # - Event ev1 -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10); @@ -838,7 +838,7 @@ END| # - Event ev2 -CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; @@ -855,7 +855,7 @@ END| # - Event ev3 -CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; @@ -872,7 +872,7 @@ END| # - Event ev4 -CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE ÐÅÒÅÍ1 CHAR(10) CHARACTER SET utf8; diff --git a/mysql-test/t/ddl_i18n_utf8.test b/mysql-test/t/ddl_i18n_utf8.test index 35109e62100..ed4e201d1e4 100644 --- a/mysql-test/t/ddl_i18n_utf8.test +++ b/mysql-test/t/ddl_i18n_utf8.test @@ -821,7 +821,7 @@ use mysqltest1| # - Event ev1 -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10); @@ -838,7 +838,7 @@ END| # - Event ev2 -CREATE EVENT ev2 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT ev2 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; @@ -855,7 +855,7 @@ END| # - Event ev3 -CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev3 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; @@ -872,7 +872,7 @@ END| # - Event ev4 -CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '2030-01-01 00:00:00' DO +CREATE EVENT mysqltest2.ev4 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO BEGIN DECLARE перем1 CHAR(10) CHARACTER SET utf8; diff --git a/mysql-test/t/events_1.test b/mysql-test/t/events_1.test index 250b0d004dc..a2747addabd 100644 --- a/mysql-test/t/events_1.test +++ b/mysql-test/t/events_1.test @@ -67,7 +67,7 @@ drop event event2; CREATE EVENT event_starts_test ON SCHEDULE EVERY 10 SECOND COMMENT "" DO SELECT 1; SELECT interval_field, interval_value, body FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; -ALTER EVENT event_starts_test ON SCHEDULE AT '2020-02-02 20:00:02'; +ALTER EVENT event_starts_test ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; ALTER EVENT event_starts_test COMMENT "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'; @@ -75,7 +75,7 @@ ALTER EVENT event_starts_test 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'; 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; +CREATE EVENT event_starts_test ON SCHEDULE EVERY 20 SECOND STARTS '1970-01-02 00:00:00' ENDS '1970-01-03 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 2; SELECT execute_at IS NULL, starts IS NULL, ends IS NULL, comment FROM mysql.event WHERE db='events_test' AND name='event_starts_test'; ALTER EVENT event_starts_test COMMENT "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'; diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index 9e84bf3ee5f..85723addbb8 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -1,5 +1,5 @@ # -# Test of refering to old values +# Test of referring to old values # --disable_warnings diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index a8e0a0094e4..e9655250245 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -678,3 +678,9 @@ select count(*) from t1; truncate table t1; --exec $MYSQL --disable-local-infile -e "/*q*/$ldli" select count(*) from t1; truncate table t1; drop table t1; + + +--echo # +--echo # MDEV-15538 '-N' Produce html output wrong +--echo # +--exec $MYSQL -NHe "select 1 as a" diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index c43193d1b57..fb1c1b089f2 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -1158,7 +1158,7 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET NEW.c1 = 'ÔÅÓÔ'; -CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT 'ÔÅÓÔ' AS test; +CREATE EVENT ev1 ON SCHEDULE AT '1970-01-02 00:00:00' ON COMPLETION PRESERVE DISABLE DO SELECT 'ÔÅÓÔ' AS test; # Test: switch the character set and show that SHOW CREATE output is # automatically converted to the new character_set_client. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 21bfc3cead2..491eb3dbda6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8479,7 +8479,8 @@ mysqld_get_one_option(int optid, val= p--; while (my_isspace(mysqld_charset, *p) && p > argument) *p-- = 0; - if (p == argument) + /* Db name can be one char also */ + if (p == argument && my_isspace(mysqld_charset, *p)) { sql_print_error("Bad syntax in replicate-rewrite-db - empty FROM db!\n"); return 1; diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 19611758ee0..0de075938d0 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6980,7 +6980,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN eng "Cannot define foreign key with %s clause on a computed column" ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN - eng "The value specified for computed column '%s' in table '%s' ignored" + eng "The value specified for computed column '%s' in table '%s' has been ignored" ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN eng "This is not yet supported for computed columns" ER_CONST_EXPR_IN_VCOL diff --git a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff index c7372326fad..243bbafe7fa 100644 --- a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff @@ -10,8 +10,8 @@ -INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -Warnings: --Warning 1906 The value specified for computed column 'b' in table 't1' ignored --Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored -SELECT a,b FROM t1; -a b -1 2 @@ -27,8 +27,8 @@ -INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -Warnings: --Warning 1906 The value specified for computed column 'b' in table 't1' ignored --Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored -SELECT a,b FROM t1; -a b -1 2 @@ -44,8 +44,8 @@ -INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -Warnings: --Warning 1906 The value specified for computed column 'b' in table 't1' ignored --Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored -SELECT a,b FROM t1; -a b -1 2 @@ -61,8 +61,8 @@ -INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -Warnings: --Warning 1906 The value specified for computed column 'b' in table 't1' ignored --Warning 1906 The value specified for computed column 'b' in table 't1' ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored +-Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored -SELECT a,b FROM t1; -a b -1 2 |