Skip to content

Commit ddf511c

Browse files
dr-mdr-m
committed
Merge 10.6 into 10.7
2 parents 1bcd87c + 1f1fa7e commit ddf511c

24 files changed

+271
-434
lines changed

‎debian/mariadb-test-data.lintian-overrides

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
22
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
33
arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
4+
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
5+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
6+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl]
7+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_local.pl]
8+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_modify.pl]
9+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl]
10+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl]
411
# Intentional for test files
512
national-encoding usr/share/mysql/mysql-test/*
613
# Extra test documentation files that really need to be kept in context in test directory

‎debian/mariadb-test.lintian-overrides

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
# These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
22
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
33
arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version
4+
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
5+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl]
6+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl]
7+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-stress-test.pl]
8+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-test-run.pl]

‎debian/source/lintian-overrides

Lines changed: 72 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,82 @@ version-substvar-for-external-package mariadb-client-core-10.7 -> mysql-client-5
44
version-substvar-for-external-package mariadb-server-10.7 -> mysql-server
55
version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
66
version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
7-
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-5.5
8-
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-5.6
9-
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-5.7
10-
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-8.0
11-
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.1
12-
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.5
13-
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.6
14-
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.7
15-
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-8.0
7+
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-5.*
8+
version-substvar-for-external-package mariadb-server-10.7 -> mysql-client-8.*
9+
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-5.*
10+
version-substvar-for-external-package mariadb-client-10.7 -> mysql-client-core-8.*
1611
version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
1712
# ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
1813
source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
1914
# Must be fixed upstream
20-
source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js*
15+
source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-*.custom.js
2116
# Intentional control relationships
22-
version-substvar-for-external-package Replaces * ${source:Version} libmariadbd-dev -> libmariadbclient-dev
23-
version-substvar-for-external-package Replaces * ${source:Version} libmariadb-dev -> libmysqlclient-dev
24-
version-substvar-for-external-package Replaces * ${source:Version} libmariadb-dev -> libmysqld-dev
17+
version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev
18+
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev
19+
version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev
2520
# We can't change build dependencies on a stable branch (10.5..10.8) so just override this
2621
missing-build-dependency-for-dh-addon systemd *
22+
# Data or test files where long lines are justified
23+
very-long-line-length-in-source-file *.test *
24+
very-long-line-length-in-source-file *.result *
25+
very-long-line-length-in-source-file BUILD/compile-*
26+
very-long-line-length-in-source-file *COPYING.rtf *
27+
# These are mainly found under extra/wolfssl
28+
very-long-line-length-in-source-file *.cproject *
29+
very-long-line-length-in-source-file *.md *
30+
very-long-line-length-in-source-file *.scfg *
31+
very-long-line-length-in-source-file *.launch *
32+
very-long-line-length-in-source-file extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c *
33+
very-long-line-length-in-source-file extra/wolfssl/wolfssl/configure.ac *
34+
very-long-line-length-in-source-file extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css *
35+
# Preprocessed C files which have long lines
36+
very-long-line-length-in-source-file extra/wolfssl/wolfssl/wolfcrypt/src/*.i *
37+
# These are all results for test cases and similar so they can be
38+
# especially formatted to be too long
39+
very-long-line-length-in-source-file mysql-test/*.dump *
40+
very-long-line-length-in-source-file mysql-test/*.inc *
41+
very-long-line-length-in-source-file mysql-test/*.rdiff *
42+
very-long-line-length-in-source-file mysql-test/*.txt *
43+
very-long-line-length-in-source-file mysql-test/*.weekly *
44+
# Test file
45+
very-long-line-length-in-source-file plugin/handler_socket/regtest/test_01_lib/test19.expected *
46+
# SQL source file that has very long inserts/selects
47+
very-long-line-length-in-source-file mysql-test/std_data/init_file_longline_3816.sql *
48+
very-long-line-length-in-source-file scripts/fill_help_tables.sql *
49+
very-long-line-length-in-source-file scripts/mysql_system_tables.sql *
50+
very-long-line-length-in-source-file scripts/mysql_test_data_timezone.sql *
51+
# Machine formated HTML
52+
very-long-line-length-in-source-file sql/share/charsets/languages.html *
53+
very-long-line-length-in-source-file sql/share/errmsg-utf8.txt *
54+
# Very long test string
55+
very-long-line-length-in-source-file storage/archive/archive_test.c line 30 is 1051 characters long (>512)
56+
# autogenerated thrift file
57+
very-long-line-length-in-source-file storage/cassandra/gen-cpp/cassandra_types.h *
58+
# ColumnStore ignores
59+
# In Directory mysql-test are some long test includes
60+
very-long-line-length-in-source-file storage/columnstore/columnstore/.drone.jsonnet *
61+
very-long-line-length-in-source-file storage/columnstore/columnstore/CMakeLists.txt *
62+
very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypetestm_tables.inc *
63+
very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypeupdate_table.inc *
64+
very-long-line-length-in-source-file storage/columnstore/columnstore/*.xmi *
65+
very-long-line-length-in-source-file storage/columnstore/columnstore/dbcon/doc/q19_plan.txt *
66+
very-long-line-length-in-source-file storage/columnstore/columnstore/utils/udfsdk/docs/source/reference/mcsv1Context.rst *
67+
very-long-line-length-in-source-file storage/columnstore/columnstore/utils/winport/win_setup_mysql_part1.sql *
68+
# Minified CSS files. These appear in several places
69+
very-long-line-length-in-source-file *badge_only.css *
70+
very-long-line-length-in-source-file *theme.css line *
71+
# General storage ignores
72+
very-long-line-length-in-source-file storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/jquery-ui-1.8.12.custom.css *
73+
very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic_bloom-master.opt *
74+
very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_enum.inc *
75+
very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_set.inc *
76+
very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_includes/footer.html *
77+
very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_posts/*.markdown line *
78+
very-long-line-length-in-source-file storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc *
79+
very-long-line-length-in-source-file storage/tokudb/PerconaFT/cmake_modules/TokuBuildTagDatabases.cmake *
80+
very-long-line-length-in-source-file storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/po.m4 *
81+
# These are generated files which should not make any harm
82+
source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.rc
83+
source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.h
84+
source-contains-autogenerated-visual-c++-file win/upgrade_wizard/resource.h
85+
source-contains-autogenerated-visual-c++-file win/upgrade_wizard/upgrade.rc

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# MDEV-28802 DROP DATABASE in InnoDB still is case-insensitive
3+
#
4+
SET @save_fpt=@@GLOBAL.innodb_file_per_table;
5+
SET GLOBAL innodb_file_per_table=0;
6+
CREATE DATABASE Db;
7+
CREATE TABLE Db.t1 (c1 INT KEY) ENGINE=InnoDB;
8+
CREATE DATABASE DB;
9+
DROP DATABASE DB;
10+
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
11+
NAME
12+
Db/t1
13+
DROP DATABASE Db;
14+
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
15+
TABLE_ID NAME FLAG N_COLS SPACE ROW_FORMAT ZIP_PAGE_SIZE SPACE_TYPE
16+
SET GLOBAL innodb_file_per_table=@save_fpt;

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--source include/have_innodb.inc
2+
--source include/have_case_sensitive_file_system.inc
3+
4+
--echo #
5+
--echo # MDEV-28802 DROP DATABASE in InnoDB still is case-insensitive
6+
--echo #
7+
8+
SET @save_fpt=@@GLOBAL.innodb_file_per_table;
9+
SET GLOBAL innodb_file_per_table=0;
10+
CREATE DATABASE Db;
11+
CREATE TABLE Db.t1 (c1 INT KEY) ENGINE=InnoDB;
12+
CREATE DATABASE DB;
13+
DROP DATABASE DB;
14+
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
15+
DROP DATABASE Db;
16+
SELECT * FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'D%';
17+
SET GLOBAL innodb_file_per_table=@save_fpt;

‎mysql-test/suite/innodb_fts/r/concurrent_insert.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ INSERT INTO t2 VALUES('mariadb');
1919
connection default;
2020
SET @saved_dbug = @@GLOBAL.debug_dbug;
2121
SET GLOBAL debug_dbug ='+d,fts_instrument_sync_request,ib_optimize_wq_hang';
22-
SET DEBUG_SYNC= 'fts_instrument_sync_request
22+
SET DEBUG_SYNC= 'fts_sync_end
2323
SIGNAL drop_index_start WAIT_FOR sync_op';
2424
INSERT INTO t1 VALUES('Keyword');
2525
connect con1,localhost,root,,,;

‎mysql-test/suite/innodb_fts/r/sync.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ INSERT INTO t1(title) VALUES('database');
1111
connection con1;
1212
SET @old_dbug = @@SESSION.debug_dbug;
1313
SET debug_dbug = '+d,fts_instrument_sync_debug';
14-
SET DEBUG_SYNC= 'fts_write_node SIGNAL written WAIT_FOR selected';
14+
SET DEBUG_SYNC= 'fts_sync_end SIGNAL written WAIT_FOR selected';
1515
INSERT INTO t1(title) VALUES('mysql database');
1616
connection default;
1717
SET DEBUG_SYNC= 'now WAIT_FOR written';
1818
SET GLOBAL innodb_ft_aux_table="test/t1";
1919
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
2020
WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION
21+
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
22+
WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION
2123
database 2 3 2 2 0
2224
database 2 3 2 3 6
2325
mysql 1 3 2 1 0
2426
mysql 1 3 2 3 0
25-
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
26-
WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION
2727
SET GLOBAL innodb_ft_aux_table=default;
2828
SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
2929
FTS_DOC_ID title
@@ -59,7 +59,7 @@ INSERT INTO t1(title) VALUES('mysql');
5959
INSERT INTO t1(title) VALUES('database');
6060
connection con1;
6161
SET debug_dbug = '+d,fts_instrument_sync_debug';
62-
SET DEBUG_SYNC= 'fts_write_node SIGNAL written WAIT_FOR inserted';
62+
SET DEBUG_SYNC= 'fts_sync_end SIGNAL written WAIT_FOR inserted';
6363
INSERT INTO t1(title) VALUES('mysql database');
6464
connection default;
6565
SET DEBUG_SYNC= 'now WAIT_FOR written';
@@ -70,14 +70,14 @@ SET debug_dbug = @old_dbug;
7070
SET GLOBAL innodb_ft_aux_table="test/t1";
7171
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
7272
WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION
73+
database 4 4 1 4 6
74+
mysql 4 4 1 4 0
7375
SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
7476
WORD FIRST_DOC_ID LAST_DOC_ID DOC_COUNT DOC_ID POSITION
7577
database 2 3 2 2 0
7678
database 2 3 2 3 6
77-
database 4 4 1 4 6
78-
mysql 1 4 3 1 0
79-
mysql 1 4 3 3 0
80-
mysql 1 4 3 4 0
79+
mysql 1 3 2 1 0
80+
mysql 1 3 2 3 0
8181
SET GLOBAL innodb_ft_aux_table=default;
8282
SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
8383
FTS_DOC_ID title

‎mysql-test/suite/innodb_fts/r/sync_block.result

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ connection con1;
3030
connection con2;
3131
/* conneciton con2 */ SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database');
3232
FTS_DOC_ID title
33+
1 mysql database
3334
connection default;
3435
# make con1 & con2 show up in mysql.slow_log
3536
SELECT SLEEP(2);
@@ -39,41 +40,11 @@ SLEEP(2)
3940
SELECT sql_text FROM mysql.slow_log WHERE query_time >= '00:00:02';
4041
sql_text
4142
INSERT INTO t1(title) VALUES('mysql database')
43+
SELECT * FROM t1 WHERE MATCH(title) AGAINST('mysql database')
4244
SET GLOBAL debug_dbug = @old_debug;
4345
TRUNCATE TABLE mysql.slow_log;
4446
DROP TABLE t1;
45-
# Case 2: Sync blocks DML(insert) on other tables.
46-
CREATE TABLE t1 (
47-
FTS_DOC_ID BIGINT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
48-
title VARCHAR(200),
49-
FULLTEXT(title)
50-
) ENGINE = InnoDB;
51-
CREATE TABLE t2(id INT);
52-
connection con1;
53-
SET GLOBAL debug_dbug='+d,fts_instrument_sync_request,fts_instrument_sync_sleep';
54-
SET DEBUG_SYNC= 'fts_instrument_sync_request SIGNAL begin WAIT_FOR continue';
55-
INSERT INTO t1(title) VALUES('mysql database');
56-
connection con2;
57-
SET DEBUG_SYNC= 'now WAIT_FOR begin';
58-
INSERT INTO t2 VALUES(1);
59-
connection default;
60-
SET DEBUG_SYNC= 'now SIGNAL continue';
61-
connection con1;
62-
/* connection con1 */ INSERT INTO t1(title) VALUES('mysql database');
63-
connection con2;
64-
/* conneciton con2 */ INSERT INTO t2 VALUES(1);
65-
connection default;
66-
SET DEBUG_SYNC = 'RESET';
67-
# make con1 & con2 show up in mysql.slow_log
68-
SELECT SLEEP(2);
69-
SLEEP(2)
70-
0
71-
# slow log results should be empty here.
72-
SELECT sql_text FROM mysql.slow_log WHERE query_time >= '00:00:02';
73-
sql_text
74-
SET GLOBAL debug_dbug = @old_debug;
75-
TRUNCATE TABLE mysql.slow_log;
76-
DROP TABLE t1,t2;
47+
SET DEBUG_SYNC=RESET;
7748
disconnect con1;
7849
disconnect con2;
7950
# Restore slow log settings.

‎mysql-test/suite/innodb_fts/t/concurrent_insert.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ INSERT INTO t2 VALUES('mariadb');
3131
connection default;
3232
SET @saved_dbug = @@GLOBAL.debug_dbug;
3333
SET GLOBAL debug_dbug ='+d,fts_instrument_sync_request,ib_optimize_wq_hang';
34-
SET DEBUG_SYNC= 'fts_instrument_sync_request
34+
SET DEBUG_SYNC= 'fts_sync_end
3535
SIGNAL drop_index_start WAIT_FOR sync_op';
3636
send INSERT INTO t1 VALUES('Keyword');
3737

‎mysql-test/suite/innodb_fts/t/sync.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ connection con1;
2626
SET @old_dbug = @@SESSION.debug_dbug;
2727
SET debug_dbug = '+d,fts_instrument_sync_debug';
2828

29-
SET DEBUG_SYNC= 'fts_write_node SIGNAL written WAIT_FOR selected';
29+
SET DEBUG_SYNC= 'fts_sync_end SIGNAL written WAIT_FOR selected';
3030

3131
send INSERT INTO t1(title) VALUES('mysql database');
3232

@@ -73,7 +73,7 @@ connection con1;
7373

7474
SET debug_dbug = '+d,fts_instrument_sync_debug';
7575

76-
SET DEBUG_SYNC= 'fts_write_node SIGNAL written WAIT_FOR inserted';
76+
SET DEBUG_SYNC= 'fts_sync_end SIGNAL written WAIT_FOR inserted';
7777

7878
send INSERT INTO t1(title) VALUES('mysql database');
7979

0 commit comments

Comments
 (0)