Skip to content

Commit 7ab4caf

Browse files
author
Grzegorz Szwarc
committed
Merge branch 'mysql-8.0' into mysql-trunk
Change-Id: Ibddaeee2f372e3017c4e54953b968b88d8d9c893
2 parents f95d79f + e1ca4f9 commit 7ab4caf

File tree

9 files changed

+332
-62
lines changed

9 files changed

+332
-62
lines changed

‎mysql-test/suite/x/r/crud_resultset_charset.result‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
CREATE SCHEMA xtest;
2+
CREATE TABLE xtest.city (
3+
`Name` CHAR(35) NOT NULL DEFAULT '',
4+
`District` CHAR(20) NOT NULL DEFAULT ''
5+
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
6+
INSERT INTO xtest.city VALUES (X'4B6F9A696365', X'56FD63686F646EE920536C6F76656E736B6F' ),
7+
(X'476F7468656E62757267205B47F67465626F72675D', X'576573742047F674616E6D61616E206CE46E' ),
8+
(X'4D616C6DF6', X'536BE56E65206CE46E' ),
9+
(X'55707073616C61', X'55707073616C61206CE46E' ),
10+
(X'4C696E6BF670696E67', X'456173742047F674616E6D61616E206CE46E' ),
11+
(X'56E473746572E573', X'56E473746D616E6C616E6473206CE46E' ),
12+
(X'D6726562726F', X'D6726562726F73206CE46E' ),
13+
(X'4E6F72726BF670696E67', X'456173742047F674616E6D61616E206CE46E' ),
14+
(X'48656C73696E67626F7267', X'536BE56E65206CE46E' ),
15+
(X'4AF66E6BF670696E67', X'4AF66E6BF670696E6773206CE46E' ),
16+
(X'556D65E5', X'56E473746572626F7474656E73206CE46E' ),
17+
(X'4C756E64', X'536BE56E65206CE46E' ),
18+
(X'426F72E573', X'576573742047F674616E6D61616E206CE46E' ),
19+
(X'53756E647376616C6C', X'56E4737465726E6F72726C616E6473206CE46E'),
20+
(X'47E4766C65', X'47E4766C65626F726773206CE46E' );
21+
Classic resultset conversion
22+
============================
23+
SELECT * FROM xtest.city;
24+
Name District
25+
Košice Východné Slovensko
26+
Gothenburg [Göteborg] West Götanmaan län
27+
Malmö Skåne län
28+
Uppsala Uppsala län
29+
Linköping East Götanmaan län
30+
Västerås Västmanlands län
31+
Örebro Örebros län
32+
Norrköping East Götanmaan län
33+
Helsingborg Skåne län
34+
Jönköping Jönköpings län
35+
Umeå Västerbottens län
36+
Lund Skåne län
37+
Borås West Götanmaan län
38+
Sundsvall Västernorrlands län
39+
Gävle Gävleborgs län
40+
41+
Xproto resultset conversion (sql stmt)
42+
======================================
43+
RUN select * from xtest.city
44+
Name District
45+
Košice Východné Slovensko
46+
Gothenburg [Göteborg] West Götanmaan län
47+
Malmö Skåne län
48+
Uppsala Uppsala län
49+
Linköping East Götanmaan län
50+
Västerås Västmanlands län
51+
Örebro Örebros län
52+
Norrköping East Götanmaan län
53+
Helsingborg Skåne län
54+
Jönköping Jönköpings län
55+
Umeå Västerbottens län
56+
Lund Skåne län
57+
Borås West Götanmaan län
58+
Sundsvall Västernorrlands län
59+
Gävle Gävleborgs län
60+
0 rows affected
61+
62+
Xproto resultset conversion (crud/table stmt)
63+
=============================================
64+
send Mysqlx.Crud.Find {
65+
collection {
66+
name: "city"
67+
schema: "xtest"
68+
}
69+
data_model: TABLE
70+
}
71+
72+
Name District
73+
Košice Východné Slovensko
74+
Gothenburg [Göteborg] West Götanmaan län
75+
Malmö Skåne län
76+
Uppsala Uppsala län
77+
Linköping East Götanmaan län
78+
Västerås Västmanlands län
79+
Örebro Örebros län
80+
Norrköping East Götanmaan län
81+
Helsingborg Skåne län
82+
Jönköping Jönköpings län
83+
Umeå Västerbottens län
84+
Lund Skåne län
85+
Borås West Götanmaan län
86+
Sundsvall Västernorrlands län
87+
Gävle Gävleborgs län
88+
command ok
89+
90+
Xproto resultset conversion (crud/doc stmt)
91+
===========================================
92+
send Mysqlx.Crud.Find {
93+
collection {
94+
name: "city"
95+
schema: "xtest"
96+
}
97+
data_model: DOCUMENT
98+
projection {
99+
source {
100+
type: IDENT
101+
identifier {
102+
name: "Name"
103+
}
104+
}
105+
alias: "Name"
106+
}
107+
projection {
108+
source {
109+
type: IDENT
110+
identifier {
111+
name: "District"
112+
}
113+
}
114+
alias: "District"
115+
}
116+
}
117+
118+
doc
119+
{"Name": "Košice", "District": "Východné Slovensko"}
120+
{"Name": "Gothenburg [Göteborg]", "District": "West Götanmaan län"}
121+
{"Name": "Malmö", "District": "Skåne län"}
122+
{"Name": "Uppsala", "District": "Uppsala län"}
123+
{"Name": "Linköping", "District": "East Götanmaan län"}
124+
{"Name": "Västerås", "District": "Västmanlands län"}
125+
{"Name": "Örebro", "District": "Örebros län"}
126+
{"Name": "Norrköping", "District": "East Götanmaan län"}
127+
{"Name": "Helsingborg", "District": "Skåne län"}
128+
{"Name": "Jönköping", "District": "Jönköpings län"}
129+
{"Name": "Umeå", "District": "Västerbottens län"}
130+
{"Name": "Lund", "District": "Skåne län"}
131+
{"Name": "Borås", "District": "West Götanmaan län"}
132+
{"Name": "Sundsvall", "District": "Västernorrlands län"}
133+
{"Name": "Gävle", "District": "Gävleborgs län"}
134+
command ok
135+
Mysqlx.Ok {
136+
msg: "bye!"
137+
}
138+
ok
139+
DROP SCHEMA IF EXISTS xtest;

‎mysql-test/suite/x/r/notices_disable.result‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ Mysqlx.Resultset.ColumnMetaData {
696696
original_table: ""
697697
schema: ""
698698
catalog: "def"
699-
collation: 33
699+
collation: 45
700700
length: 21
701701
flags: 16
702702
}
@@ -721,7 +721,7 @@ Mysqlx.Resultset.ColumnMetaData {
721721
original_table: ""
722722
schema: ""
723723
catalog: "def"
724-
collation: 33
724+
collation: 45
725725
length: 1536
726726
flags: 16
727727
}
@@ -820,7 +820,7 @@ Mysqlx.Resultset.ColumnMetaData {
820820
original_table: "t1"
821821
schema: "test"
822822
catalog: "def"
823-
collation: 33
823+
collation: 45
824824
length: 30
825825
}
826826

@@ -874,7 +874,7 @@ Mysqlx.Resultset.ColumnMetaData {
874874
original_table: "t1"
875875
schema: "test"
876876
catalog: "def"
877-
collation: 33
877+
collation: 45
878878
length: 30
879879
}
880880

@@ -2125,7 +2125,7 @@ Mysqlx.Resultset.ColumnMetaData {
21252125
original_table: ""
21262126
schema: ""
21272127
catalog: "def"
2128-
collation: 33
2128+
collation: 45
21292129
length: 21
21302130
flags: 16
21312131
}
@@ -2150,7 +2150,7 @@ Mysqlx.Resultset.ColumnMetaData {
21502150
original_table: ""
21512151
schema: ""
21522152
catalog: "def"
2153-
collation: 33
2153+
collation: 45
21542154
length: 1536
21552155
flags: 16
21562156
}
@@ -2185,7 +2185,7 @@ Mysqlx.Resultset.ColumnMetaData {
21852185
original_table: ""
21862186
schema: ""
21872187
catalog: "def"
2188-
collation: 33
2188+
collation: 45
21892189
length: 21
21902190
flags: 16
21912191
}
@@ -2210,7 +2210,7 @@ Mysqlx.Resultset.ColumnMetaData {
22102210
original_table: ""
22112211
schema: ""
22122212
catalog: "def"
2213-
collation: 33
2213+
collation: 45
22142214
length: 1536
22152215
flags: 16
22162216
}
@@ -2318,7 +2318,7 @@ Mysqlx.Resultset.ColumnMetaData {
23182318
original_table: ""
23192319
schema: ""
23202320
catalog: "def"
2321-
collation: 33
2321+
collation: 45
23222322
length: 21
23232323
flags: 16
23242324
}
@@ -2343,7 +2343,7 @@ Mysqlx.Resultset.ColumnMetaData {
23432343
original_table: ""
23442344
schema: ""
23452345
catalog: "def"
2346-
collation: 33
2346+
collation: 45
23472347
length: 1536
23482348
flags: 16
23492349
}

‎mysql-test/suite/x/r/notices_enable.result‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ Mysqlx.Resultset.ColumnMetaData {
840840
original_table: ""
841841
schema: ""
842842
catalog: "def"
843-
collation: 33
843+
collation: 45
844844
length: 21
845845
flags: 16
846846
}
@@ -865,7 +865,7 @@ Mysqlx.Resultset.ColumnMetaData {
865865
original_table: ""
866866
schema: ""
867867
catalog: "def"
868-
collation: 33
868+
collation: 45
869869
length: 1536
870870
flags: 16
871871
}
@@ -946,7 +946,7 @@ Mysqlx.Resultset.ColumnMetaData {
946946
original_table: "t1"
947947
schema: "test"
948948
catalog: "def"
949-
collation: 33
949+
collation: 45
950950
length: 30
951951
}
952952

@@ -1027,7 +1027,7 @@ Mysqlx.Resultset.ColumnMetaData {
10271027
original_table: "t1"
10281028
schema: "test"
10291029
catalog: "def"
1030-
collation: 33
1030+
collation: 45
10311031
length: 30
10321032
}
10331033

@@ -6891,7 +6891,7 @@ Mysqlx.Resultset.ColumnMetaData {
68916891
original_table: ""
68926892
schema: ""
68936893
catalog: "def"
6894-
collation: 33
6894+
collation: 45
68956895
length: 21
68966896
flags: 16
68976897
}
@@ -6916,7 +6916,7 @@ Mysqlx.Resultset.ColumnMetaData {
69166916
original_table: ""
69176917
schema: ""
69186918
catalog: "def"
6919-
collation: 33
6919+
collation: 45
69206920
length: 1536
69216921
flags: 16
69226922
}
@@ -6947,7 +6947,7 @@ Mysqlx.Resultset.ColumnMetaData {
69476947
original_table: ""
69486948
schema: ""
69496949
catalog: "def"
6950-
collation: 33
6950+
collation: 45
69516951
length: 21
69526952
flags: 16
69536953
}
@@ -6972,7 +6972,7 @@ Mysqlx.Resultset.ColumnMetaData {
69726972
original_table: ""
69736973
schema: ""
69746974
catalog: "def"
6975-
collation: 33
6975+
collation: 45
69766976
length: 1536
69776977
flags: 16
69786978
}
@@ -7068,7 +7068,7 @@ Mysqlx.Resultset.ColumnMetaData {
70687068
original_table: ""
70697069
schema: ""
70707070
catalog: "def"
7071-
collation: 33
7071+
collation: 45
70727072
length: 21
70737073
flags: 16
70747074
}
@@ -7093,7 +7093,7 @@ Mysqlx.Resultset.ColumnMetaData {
70937093
original_table: ""
70947094
schema: ""
70957095
catalog: "def"
7096-
collation: 33
7096+
collation: 45
70977097
length: 1536
70987098
flags: 16
70997099
}

0 commit comments

Comments
 (0)