From 2450fd67ed403bb8a154925dd1ca500b23f5b3cc Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 2 Jan 2019 12:03:15 +0100 Subject: [PATCH 1/3] fix the test for 2019 --- mysql-test/r/mysqldump.result | 6 +++--- mysql-test/t/mysqldump.test | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 99b14189282..bb9bba01fdf 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -4317,12 +4317,12 @@ second ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL E show create event ee1; Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation ee1 UTC CREATE DEFINER=`root`@`localhost` EVENT `ee1` ON SCHEDULE AT '2035-12-31 20:01:23' ON COMPLETION NOT PRESERVE ENABLE DO set @a=5 latin1 latin1_swedish_ci latin1_swedish_ci -create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5; +create event ee2 on schedule at '2030-12-31 21:01:22' do set @a=5; create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5; show events; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation second ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci -second ee2 root@localhost UTC ONE TIME 2018-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci +second ee2 root@localhost UTC ONE TIME 2030-12-31 21:01:22 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci second ee3 root@localhost UTC ONE TIME 2030-12-31 22:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci drop database second; create database third; @@ -4330,7 +4330,7 @@ use third; show events; Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation third ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci -third ee2 root@localhost UTC ONE TIME 2018-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci +third ee2 root@localhost UTC ONE TIME 2030-12-31 21:01:22 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci third ee3 root@localhost UTC ONE TIME 2030-12-31 22:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci drop database third; set time_zone = 'SYSTEM'; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index cb12919a823..a8820f42541 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1803,7 +1803,7 @@ show create event ee1; ## prove three works (with spaces and tabs on the end) # start with one from the previous restore -create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5; +create event ee2 on schedule at '2030-12-31 21:01:22' do set @a=5; create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5; show events; --exec $MYSQL_DUMP --events second > $MYSQLTEST_VARDIR/tmp/bug16853-2.sql From 32150d2513b2de1ff5b4ac3f4d9aa3470ae1c333 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 2 Jan 2019 19:28:48 +0100 Subject: [PATCH 2/3] compilation warning on Windows --- storage/innobase/handler/handler0alter.cc | 2 +- storage/xtradb/handler/handler0alter.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 8fbdf6c6884..25019b8f964 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -4551,7 +4551,7 @@ err_exit: info = pars_info_create(); - int pos = i; + ulint pos = i; if (has_prefixes) { pos = (pos << 16) + field->prefix_len; } diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index bdec9a076ac..e932e2cbbdb 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -4565,7 +4565,7 @@ err_exit: info = pars_info_create(); - int pos = i; + ulint pos = i; if (has_prefixes) { pos = (pos << 16) + field->prefix_len; } From 884caeafbaea50f5380c21c844b4a65323b5eb11 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 2 Jan 2019 19:32:05 +0100 Subject: [PATCH 3/3] fix RHEL8 "ambiguous python shebang" build failures --- storage/tokudb/mysql-test/tokudb/t/change_column_bin.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_char.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py | 0 .../tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_int.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py | 0 .../tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py | 0 storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py | 0 10 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_bin.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_char.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_int.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py mode change 100755 => 100644 storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py old mode 100755 new mode 100644 diff --git a/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py b/storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py old mode 100755 new mode 100644