Skip to content

Commit 1fc87de

Browse files
an3lan3l
committed
Address review
1 parent 643aaf9 commit 1fc87de

File tree

2 files changed

+43
-45
lines changed

2 files changed

+43
-45
lines changed

‎mysql-test/main/mysqldump.result‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,64 +5909,63 @@ drop database d;
59095909
# myslqdump will forget sequence definition details on --no-data dump
59105910
#
59115911
create database d;
5912-
use d;
5913-
CREATE SEQUENCE s1 START WITH 100 INCREMENT BY 10 MINVALUE=100 MAXVALUE=1100 CYCLE;
5914-
CREATE SEQUENCE s2 START WITH 200 INCREMENT BY 20 MINVALUE=200 MAXVALUE=1200 CYCLE;
5915-
CREATE SEQUENCE s3 START WITH 300 INCREMENT BY 30 MINVALUE=300 MAXVALUE=1300 CYCLE;
5916-
CREATE SEQUENCE s4 START WITH 400 INCREMENT BY 40 MINVALUE=400 MAXVALUE=1400 CYCLE;
5917-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
5918-
NEXTVAL(s1) NEXTVAL(s2) NEXTVAL(s3) NEXTVAL(s4)
5912+
CREATE SEQUENCE d.s1 START WITH 100 INCREMENT BY 10 MINVALUE=100 MAXVALUE=1100 CYCLE;
5913+
CREATE SEQUENCE d.s2 START WITH 200 INCREMENT BY 20 MINVALUE=200 MAXVALUE=1200 CYCLE;
5914+
CREATE SEQUENCE d.s3 START WITH 300 INCREMENT BY 30 MINVALUE=300 MAXVALUE=1300 CYCLE;
5915+
CREATE SEQUENCE d.s4 START WITH 400 INCREMENT BY 40 MINVALUE=400 MAXVALUE=1400 CYCLE;
5916+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
5917+
NEXTVAL(d.s1) NEXTVAL(d.s2) NEXTVAL(d.s3) NEXTVAL(d.s4)
59195918
100 200 300 400
59205919
# Show create before dump
5921-
show create sequence s1;
5920+
show create sequence d.s1;
59225921
Table Create Table
59235922
s1 CREATE SEQUENCE `s1` start with 100 minvalue 100 maxvalue 1100 increment by 10 cache 1000 cycle ENGINE=MyISAM
5924-
show create sequence s2;
5923+
show create sequence d.s2;
59255924
Table Create Table
59265925
s2 CREATE SEQUENCE `s2` start with 200 minvalue 200 maxvalue 1200 increment by 20 cache 1000 cycle ENGINE=MyISAM
5927-
show create sequence s3;
5926+
show create sequence d.s3;
59285927
Table Create Table
59295928
s3 CREATE SEQUENCE `s3` start with 300 minvalue 300 maxvalue 1300 increment by 30 cache 1000 cycle ENGINE=MyISAM
5930-
show create sequence s4;
5929+
show create sequence d.s4;
59315930
Table Create Table
59325931
s4 CREATE SEQUENCE `s4` start with 400 minvalue 400 maxvalue 1400 increment by 40 cache 1000 cycle ENGINE=MyISAM
59335932
# Dump sequence without `--no-data`
59345933
# Restore from mysqldump
59355934
# Show create after restore
5936-
show create sequence s1;
5935+
show create sequence d.s1;
59375936
Table Create Table
59385937
s1 CREATE SEQUENCE `s1` start with 100 minvalue 100 maxvalue 1100 increment by 10 cache 1000 cycle ENGINE=MyISAM
5939-
show create sequence s2;
5938+
show create sequence d.s2;
59405939
Table Create Table
59415940
s2 CREATE SEQUENCE `s2` start with 200 minvalue 200 maxvalue 1200 increment by 20 cache 1000 cycle ENGINE=MyISAM
5942-
show create sequence s3;
5941+
show create sequence d.s3;
59435942
Table Create Table
59445943
s3 CREATE SEQUENCE `s3` start with 300 minvalue 300 maxvalue 1300 increment by 30 cache 1000 cycle ENGINE=MyISAM
5945-
show create sequence s4;
5944+
show create sequence d.s4;
59465945
Table Create Table
59475946
s4 CREATE SEQUENCE `s4` start with 400 minvalue 400 maxvalue 1400 increment by 40 cache 1000 cycle ENGINE=MyISAM
5948-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
5949-
NEXTVAL(s1) NEXTVAL(s2) NEXTVAL(s3) NEXTVAL(s4)
5947+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
5948+
NEXTVAL(d.s1) NEXTVAL(d.s2) NEXTVAL(d.s3) NEXTVAL(d.s4)
59505949
100 200 300 400
59515950
# Dump sequence with `--no-data`
59525951
# Restore from mysqldump
59535952
# Show create after restore `--no-data`
5954-
show create sequence s1;
5953+
show create sequence d.s1;
59555954
Table Create Table
59565955
s1 CREATE SEQUENCE `s1` start with 100 minvalue 100 maxvalue 1100 increment by 10 cache 1000 cycle ENGINE=MyISAM
5957-
show create sequence s2;
5956+
show create sequence d.s2;
59585957
Table Create Table
59595958
s2 CREATE SEQUENCE `s2` start with 200 minvalue 200 maxvalue 1200 increment by 20 cache 1000 cycle ENGINE=MyISAM
5960-
show create sequence s3;
5959+
show create sequence d.s3;
59615960
Table Create Table
59625961
s3 CREATE SEQUENCE `s3` start with 300 minvalue 300 maxvalue 1300 increment by 30 cache 1000 cycle ENGINE=MyISAM
5963-
show create sequence s4;
5962+
show create sequence d.s4;
59645963
Table Create Table
59655964
s4 CREATE SEQUENCE `s4` start with 400 minvalue 400 maxvalue 1400 increment by 40 cache 1000 cycle ENGINE=MyISAM
5966-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
5967-
NEXTVAL(s1) NEXTVAL(s2) NEXTVAL(s3) NEXTVAL(s4)
5965+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
5966+
NEXTVAL(d.s1) NEXTVAL(d.s2) NEXTVAL(d.s3) NEXTVAL(d.s4)
59685967
100 200 300 400
5969-
drop sequence s1, s2, s3, s4;
5968+
drop sequence d.s1, d.s2, d.s3, d.s4;
59705969
drop database d;
59715970
#
59725971
# MDEV-20070

‎mysql-test/main/mysqldump.test‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2798,19 +2798,18 @@ drop database d;
27982798
--echo # myslqdump will forget sequence definition details on --no-data dump
27992799
--echo #
28002800
create database d;
2801-
use d;
28022801

2803-
CREATE SEQUENCE s1 START WITH 100 INCREMENT BY 10 MINVALUE=100 MAXVALUE=1100 CYCLE;
2804-
CREATE SEQUENCE s2 START WITH 200 INCREMENT BY 20 MINVALUE=200 MAXVALUE=1200 CYCLE;
2805-
CREATE SEQUENCE s3 START WITH 300 INCREMENT BY 30 MINVALUE=300 MAXVALUE=1300 CYCLE;
2806-
CREATE SEQUENCE s4 START WITH 400 INCREMENT BY 40 MINVALUE=400 MAXVALUE=1400 CYCLE;
2807-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
2802+
CREATE SEQUENCE d.s1 START WITH 100 INCREMENT BY 10 MINVALUE=100 MAXVALUE=1100 CYCLE;
2803+
CREATE SEQUENCE d.s2 START WITH 200 INCREMENT BY 20 MINVALUE=200 MAXVALUE=1200 CYCLE;
2804+
CREATE SEQUENCE d.s3 START WITH 300 INCREMENT BY 30 MINVALUE=300 MAXVALUE=1300 CYCLE;
2805+
CREATE SEQUENCE d.s4 START WITH 400 INCREMENT BY 40 MINVALUE=400 MAXVALUE=1400 CYCLE;
2806+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
28082807

28092808
--echo # Show create before dump
2810-
show create sequence s1;
2811-
show create sequence s2;
2812-
show create sequence s3;
2813-
show create sequence s4;
2809+
show create sequence d.s1;
2810+
show create sequence d.s2;
2811+
show create sequence d.s3;
2812+
show create sequence d.s4;
28142813

28152814
--echo # Dump sequence without `--no-data`
28162815
--exec $MYSQL_DUMP --databases d > $MYSQLTEST_VARDIR/tmp/dump1.sql
@@ -2819,11 +2818,11 @@ show create sequence s4;
28192818
--remove_file $MYSQLTEST_VARDIR/tmp/dump1.sql
28202819

28212820
--echo # Show create after restore
2822-
show create sequence s1;
2823-
show create sequence s2;
2824-
show create sequence s3;
2825-
show create sequence s4;
2826-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
2821+
show create sequence d.s1;
2822+
show create sequence d.s2;
2823+
show create sequence d.s3;
2824+
show create sequence d.s4;
2825+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
28272826

28282827
--echo # Dump sequence with `--no-data`
28292828
--exec $MYSQL_DUMP --databases d --no-data > $MYSQLTEST_VARDIR/tmp/dump-no-data.sql
@@ -2832,13 +2831,13 @@ SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
28322831
--remove_file $MYSQLTEST_VARDIR/tmp/dump-no-data.sql
28332832

28342833
--echo # Show create after restore `--no-data`
2835-
show create sequence s1;
2836-
show create sequence s2;
2837-
show create sequence s3;
2838-
show create sequence s4;
2839-
SELECT NEXTVAL(s1),NEXTVAL(s2),NEXTVAL(s3), NEXTVAL(s4);
2834+
show create sequence d.s1;
2835+
show create sequence d.s2;
2836+
show create sequence d.s3;
2837+
show create sequence d.s4;
2838+
SELECT NEXTVAL(d.s1),NEXTVAL(d.s2),NEXTVAL(d.s3), NEXTVAL(d.s4);
28402839

2841-
drop sequence s1, s2, s3, s4;
2840+
drop sequence d.s1, d.s2, d.s3, d.s4;
28422841
drop database d;
28432842

28442843
--echo #

0 commit comments

Comments
 (0)