Commit graph

192891 commits

Author SHA1 Message Date
Monty
f03fee06b0 Improve error messages from Aria
- Error on commit now returns HA_ERR_COMMIT_ERROR instead of
  HA_ERR_INTERNAL_ERROR
- If checkpoint fails, it will now print out where it failed.
2021-09-15 19:27:34 +03:00
Monty
6be0ddae5e Fixed compiler warnings in CONNECT 2021-09-15 19:16:37 +03:00
Otto Kekäläinen
07abcb5045 Deb: Fix Gitlab-CI/Salsa-CI builds failures
The debian/salsa-ci.yml used to work also on upstream MariaDB.org branches,
but has recently regressed and several jobs stopped working. These fixes
are necessary to get it working again.

* Partially revert 8642f592 that never worked, as MariaDB 10.2 does not
  have a mysql.global table nor a mariadb.sys user. Those features weren't
  introduced until MariaDB 10.4.

* Partially revert 0268b871 as we don't want ColumnStore as part of the
  native Debian build. It should build only when the build is triggered
  via autobake-deb.sh (MariaDB.org builds).

* Adjust salsa-ci.yml to cope with various Stretch to Sid upgrade issues
  and remove the legacy mariadb-connector-c job completely as that package
  hasn't been around for years anymore.

* Extend Lintian overrides to be otherwise Lintian clean
2021-09-13 17:34:55 -07:00
Sergei Golubchik
1a6c130c4f perfschema: use correct type for left shifts
set_item() uses 1UL << bit, so is_set_item() must do the same.

This fixes sporadic perfschema.show_aggregate failures
(sporadic, because `bit` is the thread id, so depending on how many
tests were run before perfschema.show_aggregate it can be above or
below 32).
2021-09-12 15:42:49 +02:00
Vladislav Vaintroub
42e9506ce9 Merge branch '10.4' into 10.5 2021-09-11 17:19:36 +02:00
Vladislav Vaintroub
74368a1df8 Merge branch '10.3' into 10.4 2021-09-11 17:09:11 +02:00
Vladislav Vaintroub
e42da92265 Use mariadb- named targets for minbuild 2021-09-11 16:48:33 +02:00
Vladislav Vaintroub
cef656b11c Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO 2021-09-11 16:47:59 +02:00
Vladislav Vaintroub
c3341f8440 Merge branch '10.4' into 10.5
# Conflicts:
#	appveyor.yml
2021-09-11 16:40:08 +02:00
Vladislav Vaintroub
c7a721ee33 Merge branch '10.3' into 10.4 2021-09-11 16:22:55 +02:00
Vladislav Vaintroub
8988e471b5 Merge branch '10.2' into 10.3
# Conflicts:
#	cmake/os/Windows.cmake
#	sql/sql_yacc.yy
2021-09-11 16:21:36 +02:00
Vladislav Vaintroub
f345172379 MDEV-26527 speedup appveyor build - 10.2 2021-09-11 15:19:42 +02:00
Vladislav Vaintroub
3504f70f7f Bison 3.7 - fix "conversion from 'ptrdiff_t' to 'ulong', possible loss of data" 2021-09-11 15:19:42 +02:00
Vladislav Vaintroub
879e21b68c Define minbuild target for 10.2 2021-09-11 15:19:42 +02:00
Vladislav Vaintroub
7e6b033507 Fix MYSQL_MAINTAINER_MODE=ERR, on Windows, with Ninja , in 10.2
A conversion warning 4267 that we want to disable(prior to 10.3),
was suppressed with  cmake VS generator for C++ and C, despite being set
only for CXX flags.

The fix is to disable the warning in C flags, too. In 10.2, this warning
is noisy, in 10.3 it is fixed.
2021-09-11 15:19:42 +02:00
Sergei Golubchik
40b743f99e remove redundant select in the perfschema.show_aggregate test
instead, include handler_rollback in the following per-connection selects
2021-09-11 12:10:23 +02:00
Sergei Golubchik
b42158be53 remove unused result file 2021-09-11 12:10:23 +02:00
Marko Mäkelä
2d0847818d Merge 10.4 into 10.5 2021-09-11 11:49:12 +03:00
Marko Mäkelä
f99cc0d2fc Merge fixup 7c33ecb665
The merge accidentally
omitted the 10.4 commit 472b35c7ef and
reverted the 10.5 commit 6e3bd663d0.
2021-09-11 11:45:17 +03:00
Marko Mäkelä
101d10b883 Merge 10.3 into 10.4 2021-09-11 11:21:39 +03:00
Marko Mäkelä
098106b432 MDEV-25951 followup: Add #ifdef around debug code 2021-09-11 11:21:25 +03:00
Marko Mäkelä
bcd25e1066 Merge 10.2 into 10.3 2021-09-11 11:14:18 +03:00
Marko Mäkelä
ac064c2b47 Fix an occasional timeout in innodb.alter_partitioned 2021-09-11 11:12:11 +03:00
Vladislav Vaintroub
e813549942 Backport "Fix generation of bison output for out-of-source builds."to 10.5
Apply 115fec58f1 to 10.5
2021-09-11 00:23:14 +02:00
Marko Mäkelä
d09426f9e6 MDEV-26537 InnoDB corrupts files due to incorrect st_blksize calculation
The st_blksize returned by fstat(2) is not documented to be
a power of 2, like we assumed in
commit 58252fff15 (MDEV-26040).
While on Linux, the st_blksize appears to report the file system
block size (which hopefully is not smaller than the sector size
of the underlying block device), on FreeBSD we observed
st_blksize values that might have been something similar to st_size.

Also IBM AIX was affected by this. A simple test case would
lead to a crash when using the minimum innodb_buffer_pool_size=5m
on both FreeBSD and AIX:

seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \
1 100|mysql test&
seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \
1 100|mysql test&

We will fix this by not trusting st_blksize at all, and assuming that
the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope
that no storage systems with larger block size exist. Anything larger
than 4096 bytes should be unlikely, given that it is the minimum
virtual memory page size of many contemporary processors.

MariaDB Server on Microsoft Windows was not affected by this.

While the 512-byte sector size of the venerable Seagate ST-225 is still
in widespread use, the minimum innodb_page_size is 4096 bytes, and
innodb_log_file_size can be set in integer multiples of 65536 bytes.

The only occasion where InnoDB uses smaller data file block sizes than
4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1
or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables,
we will from now on preallocate space in integer multiples of 4096 bytes
and let regular writes extend the file by 1024, 2048, or 3072 bytes.

The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE
should report the raw st_blksize.

For page_compressed tables, the function fil_space_get_block_size()
will map to 512 any st_blksize value that is larger than 4096.

os_file_set_size(): Assume that the file system block size is 4096 bytes,
and only support extending files to integer multiples of 4096 bytes.

fil_space_extend_must_retry(): Round down the preallocation size to
an integer multiple of 4096 bytes.
2021-09-10 19:15:41 +03:00
Vicențiu Ciorbaru
8fe927e6de Expand performance_schema tables definitions with column comments
Cover all columns that did not have comments. Adjust docs based off of
MariaDB implementation.
2021-09-10 17:16:50 +03:00
Haidong Ji
cc71dc0b61 MDEV-25325 built-in documentation for performance_schema tables
Improve documentation of performance_schema tables by appending COLUMN
comments to tables. Additionally improve test coverage and update corresponding
tests.

This is part of the patch covering newer columns and tables in 10.5.
2021-09-10 17:16:40 +03:00
Vicențiu Ciorbaru
7c33ecb665 Merge remote-tracking branch 'upstream/10.4' into 10.5 2021-09-10 17:16:18 +03:00
Eugene Kosov
4f85eadf71 MDEV-25951 followup
FTS indexes has a prefix_len=1 or prefix_len=0 as stated by comment in
mysql_prepare_create_table().

Thus, a newly added assertion should be relaxed for FTS indexes.
2021-09-10 16:58:21 +06:00
Vladislav Vaintroub
1c378f1b95 Speedup build of the MSI package 2021-09-10 12:02:44 +02:00
Sergei Golubchik
fdeaad1db9 Merge branch '10.3' into 10.4 2021-09-09 13:07:41 +02:00
Sergei Golubchik
b145fba0a8 post-merge fix 2021-09-09 13:07:36 +02:00
Sergei Golubchik
46cb16388a Merge branch '10.2' into 10.3 2021-09-09 12:15:55 +02:00
Sergei Golubchik
c7184c470e fix main.truncate failures in --embedded 2021-09-09 09:57:39 +02:00
Vicențiu Ciorbaru
de7e027d5e Merge remote-tracking branch 'upstream/10.3' into 10.4 2021-09-09 09:23:35 +03:00
Marko Mäkelä
6e3bd663d0 MDEV-25776 Race conditions in buf_pool.page_hash around buf_pool.watch
Any modification of buf_pool.page_hash is supposed to be protected
by buf_pool.mutex and page_hash_latch::write_lock(). The buffer pool
watch mechanism of the InnoDB change buffer was violating that
ever since commit b1ab211dee (MDEV-15053).

buf_pool_t::watch_set(): Extend the critical section of buf_pool.mutex.

buf_pool_t::watch_unset(): Define non-inline, because
calls are infrequent and this function became larger.
If we have to detach a sentinel from page_hash,
do it while holding both the mutex and the exclusive hash latch.

buf_pool_t::watch_remove(): Assert that the mutex is being held.

buf_page_init_for_read(): Remove some work-arounds for
previously encountered race conditions related to buf_pool.watch.
2021-09-09 09:05:26 +03:00
Eugene Kosov
a4b3970c6e MDEV-25951 MariaDB crash after ALTER TABLE convert to utf8mb4
Bug happens when partially indexed CHAR or VARCHAR field in converted from
utf8mb3 to utf8mb4.

Fixing by relaxing assertions. For some time dict_index_t and dict_table_t
are becoming not synchronized. Namely, dict_index_t has a new prefix_len which
is a multiple of a user-provided length and charset->mbmaxlen. But
the table still have and old mbmaxlen and assertion fails. This happens only
during utf8mb3 -> utf8mb4 conversions and the magic number 4 comes from
utf8mb_4_.

At the end of ALTER TABLE (innobase_rename_or_enlarge_columns_cache())
dict_index_t and dict_table_t became synchronized
again and will stay so at all times. For, example, they will be synchronized
on table load and newly added assertion proves that.
2021-09-08 16:08:32 +06:00
Sergei Golubchik
a6383a1954 Merge branch '10.2' into 10.3 2021-09-07 23:24:06 +02:00
Sergei Golubchik
0d3de06eda disable bzip2/lz4/lzo in rpm builds, distro dependent 2021-09-07 21:13:04 +02:00
Sergei Golubchik
ca2f89deac disable bzip2/lz4/lzo in bintar builds, as they always have been 2021-09-07 21:13:04 +02:00
Vicențiu Ciorbaru
b85b8348e7 Merge branch '10.2' into 10.3 2021-09-07 16:32:35 +03:00
Anel Husakovic
630d722902 MDEV-19227: mysql_plugin doesn't run bootstrap from source
Reviewed by: serg@mariadb.com
             daniel@mariadb.org
2021-09-07 14:25:56 +02:00
Jan Lindström
987903b38e MDEV-26503 : galera_3nodes.galera_wsrep_schema MTR failed: mysql_shutdown failed
Add wait conditions and clean up.
2021-09-07 13:43:51 +03:00
Jan Lindström
56b6c14ee6 MDEV-26502 : galera.galera_applier_ftwrl_table_alter MTR failed : Result content mismatch
Add wait conditions and remove unnecessary sleep.
2021-09-07 09:28:35 +03:00
Marko Mäkelä
eb2f2c1e5f MDEV-26547 fixup: Wait for read completion
buf_load(): Wait for the submitted reads to finish before updating
innodb_buffer_pool_load_status.
2021-09-07 08:55:08 +03:00
Haidong Ji
528abc749e MDEV-25325 built-in documentation for performance_schema tables
Improve documentation of performance_schema tables by appending COLUMN
comments to tables. Additionally improve test coverage and update corresponding
tests.
2021-09-07 08:45:19 +03:00
Vladislav Vaintroub
b729c1a1ec Fix a false positive GCC5 warning. 2021-09-06 19:07:24 +02:00
Rucha Deodhar
edde990e35 MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())'
failed upon killed TRUNCATE

Note: This is a backport of 1cb4caa66d from
10.3
Analysis: Assertion failure happens because less session memory is set and so
table can't be reopened. So the statement can't be used. This error goes
unreported.
Fix: Return the error state.
2021-09-06 18:12:45 +05:30
Sergei Golubchik
f17537579a disable cmake feature summary after the first run
because the summary is incorrect after the first run anyway
2021-09-06 09:49:53 +02:00
Marko Mäkelä
84c578c795 MDEV-26547 Restoring InnoDB buffer pool dump is single-threaded for no reason
buf_read_page_background(): Remove the parameter "bool sync"
and always actually initiate a page read in the background.

buf_load(): Always submit asynchronous reads. This allows
page checksums to be verified in concurrent threads as
soon as the reads are completed.
2021-09-06 10:14:24 +03:00