Skip to content

Commit f80e02e

Browse files
vuvovavuvova
committed
Merge branch '10.2' into 10.3
2 parents 2842c36 + 39e5b76 commit f80e02e

File tree

16 files changed

+308
-139
lines changed

16 files changed

+308
-139
lines changed

‎cmake/cpack_rpm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ELSE()
3939
SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
4040
OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
4141
MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
42+
SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}")
4243
ENDIF()
4344

4445
SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
@@ -270,7 +271,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
270271
SET(CPACK_SOURCE_GENERATOR "RPM")
271272
SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS
272273
"-DRPM=${RPM}"
273-
"-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}"
274274
)
275275

276276
MACRO(ADDIF var)

‎mysql-test/lib/My/Handles.pm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ use My::Platform;
2424

2525
my $handle_exe;
2626

27-
28-
if (IS_WINDOWS){
27+
sub import {
28+
my $self = shift;
29+
my $params = shift;
30+
return if (!IS_WINDOWS || $handle_exe);
2931
# Check if handle.exe is available
3032
# Pass switch to accept the EULA to avoid hanging
3133
# if the program hasn't been run before.
@@ -35,7 +37,7 @@ if (IS_WINDOWS){
3537
$handle_exe= "$2.$3"
3638
if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/);
3739
}
38-
if ($handle_exe){
40+
if ($handle_exe && (!$params || !$params->{suppress_init_messages})){
3941
print "Found handle.exe version $handle_exe\n";
4042
}
4143
}

‎mysql-test/suite/mariabackup/big_innodb_log.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ rmdir $targetdir;
7676

7777
perl;
7878
use lib "lib";
79+
use My::Handles { suppress_init_messages => 1 };
7980
use My::File::Path;
8081
my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ?
8182
"$ENV{'MYSQLTEST_VARDIR'}/install.db" :

‎mysql-test/suite/mariabackup/disabled.def

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎mysql-test/suite/vcol/r/vcol_sql_mode.result

Lines changed: 150 additions & 54 deletions
Large diffs are not rendered by default.

‎mysql-test/suite/vcol/r/vcol_sql_mode_upgrade.result

Lines changed: 71 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,40 +52,66 @@ Warnings:
5252
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
5353
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
5454
CREATE TABLE t2 LIKE t1;
55-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
55+
Warnings:
56+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
57+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
58+
DROP TABLE t2;
5659
FLUSH TABLES;
5760
CREATE TABLE t2 LIKE t1;
58-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
61+
Warnings:
62+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
63+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
64+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
65+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
66+
DROP TABLE t2;
5967
SHOW CREATE TABLE t1;
6068
Table Create Table
6169
t1 CREATE TABLE `t1` (
6270
`a` char(5) DEFAULT NULL,
6371
`v` varchar(5) GENERATED ALWAYS AS (`a`) STORED
6472
) ENGINE=MyISAM DEFAULT CHARSET=latin1
73+
ALTER TABLE t1 ADD b INT DEFAULT a;
6574
Warnings:
6675
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
6776
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
68-
ALTER TABLE t1 ADD b INT DEFAULT a;
69-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
77+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
78+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
79+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
80+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
7081
SHOW CREATE TABLE t1;
7182
Table Create Table
7283
t1 CREATE TABLE `t1` (
7384
`a` char(5) DEFAULT NULL,
74-
`v` varchar(5) GENERATED ALWAYS AS (`a`) STORED
85+
`v` varchar(5) GENERATED ALWAYS AS (`a`) STORED,
86+
`b` int(11) DEFAULT `a`
7587
) ENGINE=MyISAM DEFAULT CHARSET=latin1
88+
Warnings:
89+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
90+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
7691
SELECT * FROM t1;
77-
a v
78-
1 1
79-
2 2
80-
3 3
92+
a v b
93+
1 1 1
94+
2 2 2
95+
3 3 3
8196
FLUSH TABLES;
8297
ALTER TABLE t1 ADD c INT DEFAULT a;
83-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
98+
Warnings:
99+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
100+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
101+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
102+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
103+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
104+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
105+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
106+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
84107
SELECT * FROM t1;
85-
a v
86-
1 1
87-
2 2
88-
3 3
108+
a v b c
109+
1 1 1 1
110+
2 2 2 2
111+
3 3 3 3
112+
Warnings:
113+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
114+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
89115
DROP TABLE t1;
90116
#
91117
# Fixing a Maria-10.2.26 table with a stored VARCHAR column
@@ -177,30 +203,52 @@ Warnings:
177203
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
178204
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
179205
CREATE TABLE t2 LIKE t1;
180-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
206+
Warnings:
207+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
208+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
209+
DROP TABLE t2;
181210
FLUSH TABLES;
182211
CREATE TABLE t2 LIKE t1;
183-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
212+
Warnings:
213+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
214+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
215+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
216+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
217+
DROP TABLE t2;
184218
SHOW CREATE TABLE t1;
185219
Table Create Table
186220
t1 CREATE TABLE `t1` (
187221
`a` char(5) DEFAULT NULL,
188222
`v` varchar(5) GENERATED ALWAYS AS (`a`) VIRTUAL,
189223
KEY `v` (`v`)
190224
) ENGINE=MyISAM DEFAULT CHARSET=latin1
225+
ALTER TABLE t1 ADD b INT DEFAULT a;
191226
Warnings:
192227
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
193228
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
194-
ALTER TABLE t1 ADD b INT DEFAULT a;
195-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
229+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
230+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
231+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
232+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
196233
FLUSH TABLES;
197234
ALTER TABLE t1 ADD c INT DEFAULT a;
198-
ERROR HY000: Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
235+
Warnings:
236+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
237+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
238+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
239+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
240+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
241+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
242+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
243+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
199244
SELECT * FROM t1;
200-
a v
201-
1 1
202-
2 2
203-
3 3
245+
a v b c
246+
1 1 1 1
247+
2 2 2 2
248+
3 3 3 3
249+
Warnings:
250+
Warning 1901 Function or expression '`a`' cannot be used in the GENERATED ALWAYS AS clause of `v`
251+
Warning 1105 Expression depends on the @@sql_mode value PAD_CHAR_TO_FULL_LENGTH
204252
DROP TABLE t1;
205253
#
206254
# Fixing a Maria-10.2.26 table with a virtual VARCHAR column

0 commit comments

Comments
 (0)