Skip to content

Commit 87bd79b

Browse files
dr-mdr-m
committed
Merge 10.5 into 10.6
2 parents d96436c + ea847cb commit 87bd79b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1619
-1009
lines changed

‎debian/autobake-deb.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,15 @@ disable_pmem()
6969

7070
architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
7171

72-
CODENAME="$(lsb_release -sc)"
73-
case "${CODENAME}" in
72+
LSBID="$(lsb_release -si | tr '[:upper:]' '[:lower:]')"
73+
LSBVERSION="$(lsb_release -sr | sed -e "s#\.##g")"
74+
LSBNAME="$(lsb_release -sc)"
75+
76+
if [ -z "${LSBID}" ]
77+
then
78+
LSBID="unknown"
79+
fi
80+
case "${LSBNAME}" in
7481
stretch)
7582
# MDEV-16525 libzstd-dev-1.1.3 minimum version
7683
sed -e '/libzstd-dev/d' \
@@ -127,7 +134,7 @@ case "${CODENAME}" in
127134
fi
128135
;;
129136
*)
130-
echo "Error - unknown release codename $CODENAME" >&2
137+
echo "Error - unknown release codename $LSBNAME" >&2
131138
exit 1
132139
esac
133140

@@ -144,9 +151,9 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${
144151
PATCHLEVEL="+maria"
145152
LOGSTRING="MariaDB build"
146153
EPOCH="1:"
147-
VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}"
154+
VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${LSBID:0:3}${LSBVERSION}"
148155

149-
dch -b -D "${CODENAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}." --controlmaint
156+
dch -b -D ${LSBNAME} -v "${VERSION}" "Automatic build with ${LOGSTRING}." --controlmaint
150157

151158
echo "Creating package version ${VERSION} ... "
152159

‎mysql-test/main/key_cache.result

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,3 +834,25 @@ set global keycache2.key_buffer_size=0;
834834
set global key_buffer_size=@save_key_buffer_size;
835835
set global key_cache_segments=@save_key_cache_segments;
836836
set global key_cache_file_hash_size=@save_key_cache_file_hash_size;
837+
#
838+
# SIGSEGV in flush_all_key_blocks when changing
839+
# key_buffer_size / ASAN: heap-use-after-free in flush_all_key_blocks
840+
#
841+
SET GLOBAL keycache1.key_cache_segments=7;
842+
SET GLOBAL keycache1.key_buffer_size=1*1024*1024;
843+
SET GLOBAL keycache1.key_buffer_size=0;
844+
SET GLOBAL keycache1.key_buffer_size=128*1024;
845+
create table t1 (p int primary key, a char(10)) delay_key_write=1;
846+
cache index t1 key (`primary`) in keycache1;
847+
Table Op Msg_type Msg_text
848+
test.t1 assign_to_keycache status OK
849+
insert into t1 values (1, 'qqqq'), (11, 'yyyy');
850+
select * from t1;
851+
p a
852+
1 qqqq
853+
11 yyyy
854+
drop table t1;
855+
SET GLOBAL keycache1.key_buffer_size=0;
856+
#
857+
# End of 10.3 tests
858+
#

‎mysql-test/main/key_cache.test

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,3 +538,24 @@ set global key_cache_segments=@save_key_cache_segments;
538538
set global key_cache_file_hash_size=@save_key_cache_file_hash_size;
539539

540540
# End of 5.2 tests
541+
542+
--echo #
543+
--echo # SIGSEGV in flush_all_key_blocks when changing
544+
--echo # key_buffer_size / ASAN: heap-use-after-free in flush_all_key_blocks
545+
--echo #
546+
547+
SET GLOBAL keycache1.key_cache_segments=7;
548+
SET GLOBAL keycache1.key_buffer_size=1*1024*1024;
549+
SET GLOBAL keycache1.key_buffer_size=0;
550+
SET GLOBAL keycache1.key_buffer_size=128*1024;
551+
create table t1 (p int primary key, a char(10)) delay_key_write=1;
552+
cache index t1 key (`primary`) in keycache1;
553+
insert into t1 values (1, 'qqqq'), (11, 'yyyy');
554+
select * from t1;
555+
drop table t1;
556+
SET GLOBAL keycache1.key_buffer_size=0;
557+
558+
559+
--echo #
560+
--echo # End of 10.3 tests
561+
--echo #

‎mysql-test/main/kill.result

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,20 +197,6 @@ f2
197197
connection default;
198198
SET DEBUG_SYNC = 'RESET';
199199
DROP TABLE t1, t2;
200-
connection con1;
201-
connection con2;
202-
connection con1;
203-
SET SESSION optimizer_search_depth=0;
204-
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
205-
PREPARE stmt FROM 'EXPLAIN SELECT * FROM t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,t27,t28,t29,t30,t31,t32,t33,t34,t35,t36,t37,t38,t39,t40 WHERE a1=a2 AND a2=a3 AND a3=a4 AND a4=a5 AND a5=a6 AND a6=a7 AND a7=a8 AND a8=a9 AND a9=a10 AND a10=a11 AND a11=a12 AND a12=a13 AND a13=a14 AND a14=a15 AND a15=a16 AND a16=a17 AND a17=a18 AND a18=a19 AND a19=a20 AND a20=a21 AND a21=a22 AND a22=a23 AND a23=a24 AND a24=a25 AND a25=a26 AND a26=a27 AND a27=a28 AND a28=a29 AND a29=a30 AND a30=a31 AND a31=a32 AND a32=a33 AND a33=a34 AND a34=a35 AND a35=a36 AND a36=a37 AND a37=a38 AND a38=a39 AND a39=a40 ';
206-
EXECUTE stmt;
207-
connection con2;
208-
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
209-
KILL QUERY @id;
210-
connection con1;
211-
ERROR 70100: Query execution was interrupted
212-
connection default;
213-
SET DEBUG_SYNC = 'RESET';
214200
#
215201
# Bug#19723: kill of active connection yields different error code
216202
# depending on platform.

‎mysql-test/main/kill.test

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -271,74 +271,6 @@ connection default;
271271
SET DEBUG_SYNC = 'RESET';
272272
DROP TABLE t1, t2;
273273

274-
#
275-
# Bug#28598: mysqld crash when killing a long-running explain query.
276-
#
277-
connection con1;
278-
let $ID= `SELECT @id := CONNECTION_ID()`;
279-
connection con2;
280-
let $ignore= `SELECT @id := $ID`;
281-
connection con1;
282-
--disable_query_log
283-
let $tab_count= 40;
284-
285-
--disable_query_log
286-
begin;
287-
let $i= $tab_count;
288-
while ($i)
289-
{
290-
eval CREATE TABLE t$i (a$i INT, KEY(a$i));
291-
eval INSERT INTO t$i VALUES (1),(2),(3),(4),(5),(6),(7);
292-
dec $i ;
293-
}
294-
295-
commit;
296-
--enable_query_log
297-
298-
SET SESSION optimizer_search_depth=0;
299-
300-
let $i=$tab_count;
301-
while ($i)
302-
{
303-
let $a= a$i;
304-
let $t= t$i;
305-
dec $i;
306-
if ($i)
307-
{
308-
let $comma=,;
309-
let $from=$comma$t$from;
310-
let $where=a$i=$a $and $where;
311-
}
312-
if (!$i)
313-
{
314-
let $from=FROM $t$from;
315-
let $where=WHERE $where;
316-
}
317-
let $and=AND;
318-
}
319-
320-
--enable_query_log
321-
SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
322-
eval PREPARE stmt FROM 'EXPLAIN SELECT * $from $where';
323-
send EXECUTE stmt;
324-
325-
connection con2;
326-
SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
327-
KILL QUERY @id;
328-
connection con1;
329-
--error 1317
330-
reap;
331-
--disable_query_log
332-
let $i= $tab_count;
333-
while ($i)
334-
{
335-
eval DROP TABLE t$i;
336-
dec $i ;
337-
}
338-
--enable_query_log
339-
connection default;
340-
SET DEBUG_SYNC = 'RESET';
341-
342274
--echo #
343275
--echo # Bug#19723: kill of active connection yields different error code
344276
--echo # depending on platform.

‎mysql-test/mariadb-test-run.pl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3274,17 +3274,21 @@ ($)
32743274
if ($^O eq "MSWin32") {
32753275
push @cmd, '--binary';
32763276
}
3277-
push @cmd, (qw/-r - -f -s -o/, $dest, $base_result, $resfile);
3277+
push @cmd, (qw/-r - -f -s -o/, $dest . $$, $base_result, $resfile);
32783278
if (-w $resdir) {
32793279
# don't rebuild a file if it's up to date
32803280
unless (-e $dest and -M $dest < -M $resfile
32813281
and -M $dest < -M $base_result) {
32823282
run_system(@cmd);
3283+
rename $cmd[-3], $dest or unlink $cmd[-3];
32833284
}
32843285
} else {
3285-
$cmd[-3] = $dest = $opt_tmpdir . '/' . basename($dest);
3286+
$dest = $opt_tmpdir . '/' . basename($dest);
3287+
$cmd[-3] = $dest . $$;
32863288
run_system(@cmd);
3289+
rename $cmd[-3], $dest or unlink $cmd[-3];
32873290
}
3291+
32883292
$tinfo->{result_file} = $dest;
32893293
}
32903294

0 commit comments

Comments
 (0)