Skip to content

Commit 3d4bdf7

Browse files
vaintroubvaintroub
committed
Merge 11.5 into 11.6
2 parents aeffec6 + c96b23f commit 3d4bdf7

File tree

6 files changed

+47
-46
lines changed

6 files changed

+47
-46
lines changed

‎appveyor.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ version: build-{build}~branch-{branch}
22

33
clone_depth: 1
44

5+
environment:
6+
OPENSSL_ROOT_DIR: C:/OpenSSL-v32-Win64
7+
58
build_script:
69
# dump some system info
710
- echo processor='%PROCESSOR_IDENTIFIER%' , processor count= %NUMBER_OF_PROCESSORS%
@@ -15,14 +18,15 @@ build_script:
1518
- mkdir _build
1619
- cd _build
1720
- set BUILD_TYPE=MinSizeRel
21+
- set PATH=%OPENSSL_ROOT_DIR%;%PATH%
1822
- set GENERATOR=-GNinja
1923
- call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
20-
- cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
24+
- cmake -E time cmake %GENERATOR% .. -DWITH_SSL=system -DHAVE_OPENSSL_APPLINK_C=1 -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
2125
- set /A jobs=2*%NUMBER_OF_PROCESSORS%
2226
- cmake -E time cmake --build . -j %jobs% --config %BUILD_TYPE% --target minbuild
2327

2428
test_script:
25-
- set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
29+
- set PATH=C:\Strawberry\perl\bin;%OPENSSL_ROOT_DIR%;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
2630
- cd %APPVEYOR_BUILD_FOLDER%\_build\mysql-test
2731
- set /A parallel=4*%NUMBER_OF_PROCESSORS%
2832
- perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 --parallel=%parallel% --testcase-timeout=4 --suite=main --skip-test-list=%APPVEYOR_BUILD_FOLDER%\win\appveyor_skip_tests.txt --mysqld=--loose-innodb-flush-log-at-trx-commit=2

‎client/mysqldump.cc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -815,14 +815,11 @@ static void write_header(FILE *sql_file, const char *db_name)
815815
fprintf(sql_file, "/*!40103 SET TIME_ZONE='+00:00' */;\n");
816816
}
817817

818-
if (!path)
818+
if (!multi_file_output)
819819
{
820-
if (!multi_file_output)
821-
{
822-
/* We don't need unique checks as the table is created just before */
823-
fprintf(md_result_file,
824-
"/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n");
825-
}
820+
/* We don't need unique checks as the table is created just before */
821+
fprintf(md_result_file,
822+
"/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;\n");
826823
fprintf(md_result_file,
827824
"/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n");
828825
}

‎mysql-test/main/mysqldump.result

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6789,40 +6789,6 @@ set global max_connections=@save_max_connections;
67896789
#
67906790
# End of 11.4 tests
67916791
#
6792-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6793-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6794-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6795-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6796-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6797-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6798-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6799-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6800-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6801-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6802-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6803-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6804-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6805-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6806-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6807-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6808-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6809-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6810-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6811-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6812-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6813-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6814-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6815-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6816-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6817-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6818-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6819-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6820-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6821-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6822-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6823-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6824-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6825-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
68266792
# Content of dump directory
68276793
mtr
68286794
mysql
@@ -6836,8 +6802,6 @@ create database db2;
68366802
use db2;
68376803
create table t1(i int);
68386804
insert into t1 values(2);
6839-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
6840-
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
68416805
# Content of dump directory
68426806
db1
68436807
db2

‎mysql-test/suite/innodb/r/temp_truncate_freed.result

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size;
2+
set @old_immediate_scrub_data_val= @@innodb_immediate_scrub_data_uncompressed;
3+
SET GLOBAL innodb_immediate_scrub_data_uncompressed=1;
4+
SET GLOBAL innodb_buffer_pool_size= 16777216;
5+
CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT) ENGINE=InnoDB;
6+
INSERT INTO t1 VALUES (repeat(1,16777215));
7+
DROP TEMPORARY TABLE t1;
8+
SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
9+
SET GLOBAL innodb_buffer_pool_size=10485760;
10+
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
11+
set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;

‎mysql-test/suite/innodb/t/temp_truncate_freed.test

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--source include/have_innodb.inc
2+
3+
set @old_innodb_buffer_pool_size = @@innodb_buffer_pool_size;
4+
set @old_immediate_scrub_data_val= @@innodb_immediate_scrub_data_uncompressed;
5+
6+
SET GLOBAL innodb_immediate_scrub_data_uncompressed=1;
7+
SET GLOBAL innodb_buffer_pool_size= 16777216;
8+
9+
CREATE TEMPORARY TABLE t1(c1 MEDIUMTEXT) ENGINE=InnoDB;
10+
INSERT INTO t1 VALUES (repeat(1,16777215));
11+
DROP TEMPORARY TABLE t1;
12+
SET GLOBAL innodb_truncate_temporary_tablespace_now=1;
13+
14+
let $wait_timeout = 180;
15+
let $wait_condition =
16+
SELECT SUBSTR(variable_value, 1, 30) = 'Completed resizing buffer pool'
17+
FROM information_schema.global_status
18+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_resize_status';
19+
20+
SET GLOBAL innodb_buffer_pool_size=10485760;
21+
--source include/wait_condition.inc
22+
23+
set global innodb_buffer_pool_size = @old_innodb_buffer_pool_size;
24+
set global innodb_immediate_scrub_data_uncompressed = @old_immediate_scrub_data_val;
25+
--source include/wait_condition.inc

‎storage/innobase/fsp/fsp0fsp.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3714,7 +3714,7 @@ inline void fil_space_t::clear_freed_ranges(uint32_t threshold)
37143714
{
37153715
if (range.first >= threshold)
37163716
continue;
3717-
else if (range.last > threshold)
3717+
else if (range.last >= threshold)
37183718
{
37193719
range_t new_range{range.first, threshold - 1};
37203720
current_ranges.add_range(new_range);

0 commit comments

Comments
 (0)