database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2019-01-03 09:56:24 +01:00
parent aeefd26ecb b87eb04f77
commit 3ba3f81ae0
14 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/mysqldump.result
View File

@ -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; show create event ee1;
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation 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 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; create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;
show events; 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 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 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 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; drop database second;
create database third; create database third;
@ -4330,7 +4330,7 @@ use third;
show events; 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 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 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 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; drop database third;
set time_zone = 'SYSTEM'; set time_zone = 'SYSTEM';

2
mysql-test/t/mysqldump.test
View File

@ -1807,7 +1807,7 @@ show create event ee1;
## prove three works (with spaces and tabs on the end) ## prove three works (with spaces and tabs on the end)
# start with one from the previous restore # 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; create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;
show events; show events;
--exec $MYSQL_DUMP --events second > $MYSQLTEST_VARDIR/tmp/bug16853-2.sql --exec $MYSQL_DUMP --events second > $MYSQLTEST_VARDIR/tmp/bug16853-2.sql

2
storage/innobase/handler/handler0alter.cc
View File

@ -4668,7 +4668,7 @@ err_exit:
info = pars_info_create(); info = pars_info_create();
int pos = i; ulint pos = i;
if (has_prefixes) { if (has_prefixes) {
pos = (pos << 16) + field->prefix_len; pos = (pos << 16) + field->prefix_len;
} }

0
storage/tokudb/mysql-test/tokudb/t/change_column_bin.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_bin_rename.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_char.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_char_binary.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_char_charbinary.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_char_rename.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_int.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_int_key.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_int_not_supported.py Executable file → Normal file
View File

0
storage/tokudb/mysql-test/tokudb/t/change_column_int_rename.py Executable file → Normal file
View File

2
storage/xtradb/handler/handler0alter.cc
View File

@ -4684,7 +4684,7 @@ err_exit:
info = pars_info_create(); info = pars_info_create();
int pos = i; ulint pos = i;
if (has_prefixes) { if (has_prefixes) {
pos = (pos << 16) + field->prefix_len; pos = (pos << 16) + field->prefix_len;
} }