Compare commits
No commits in common. 'c9' and 'i8c-stream-10.3' have entirely different histories.
c9
...
i8c-stream
@ -1 +1 @@
|
|||||||
SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
|
SOURCES/mariadb-10.3.39.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
d767fc64fbf44da4e1a4174a9939356fac5fe19b SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
|
25972d22ed05249782141392f0893e71c7d549a9 SOURCES/mariadb-10.3.39.tar.gz
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
MariaDB haven't yet made a document package available for offline.
|
|
||||||
|
|
||||||
You can create your own copy with the instructions here:
|
|
||||||
|
|
||||||
https://mariadb.com/kb/en/meta/mirroring-the-mariadb-knowledge-base/
|
|
||||||
|
|
||||||
You can find view the on-line documentation at:
|
|
||||||
|
|
||||||
https://mariadb.com/kb/en/documentation/
|
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
The official MySQL documentation is not freely redistributable, so we cannot
|
||||||
|
include it in RHEL or Fedora. You can find it on-line at
|
||||||
|
|
||||||
|
http://dev.mysql.com/doc/
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
MySQL is distributed under GPL v2, but there are some licensing exceptions
|
||||||
|
that allow the client libraries to be linked with a non-GPL application,
|
||||||
|
so long as the application is under a license approved by Oracle.
|
||||||
|
For details see
|
||||||
|
|
||||||
|
http://www.mysql.com/about/legal/licensing/foss-exception/
|
||||||
|
|
||||||
|
Some innobase code from Percona and Google is under BSD license.
|
||||||
|
Some code related to test-suite is under LGPLv2.
|
||||||
@ -0,0 +1,101 @@
|
|||||||
|
--- mariadb-10.3.39/mysql-test/include/default_mysqld.cnf 2023-05-03 06:32:44.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/include/default_mysqld.cnf 2023-07-07 13:58:40.255283041 +0200
|
||||||
|
@@ -127,3 +127,8 @@ local-infile
|
||||||
|
# tables. Let's enable it in the [server] group, because this group
|
||||||
|
# is read after [mysqld] and [embedded]
|
||||||
|
loose-aria
|
||||||
|
+
|
||||||
|
+[mysqltest]
|
||||||
|
+loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem
|
||||||
|
+loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem
|
||||||
|
+loose-ssl-key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc 2023-05-03 06:32:44.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc 2023-07-07 13:55:30.424368106 +0200
|
||||||
|
@@ -11,7 +11,7 @@ let $counter= 5000;
|
||||||
|
let $mysql_errno= 9999;
|
||||||
|
while ($mysql_errno)
|
||||||
|
{
|
||||||
|
- --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013
|
||||||
|
+ --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013,2026
|
||||||
|
show status;
|
||||||
|
|
||||||
|
dec $counter;
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test 2023-05-03 06:32:45.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test 2023-07-07 13:54:31.152082427 +0200
|
||||||
|
@@ -53,7 +53,7 @@ insert into t4 values (3),(4);
|
||||||
|
connection master;
|
||||||
|
# The get_lock function causes warning for unsafe statement.
|
||||||
|
--disable_warnings
|
||||||
|
---error 0,1317,2013
|
||||||
|
+--error 0,1317,2013,2026
|
||||||
|
reap;
|
||||||
|
--enable_warnings
|
||||||
|
connection master1;
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test 2023-05-03 06:32:44.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test 2023-07-07 15:11:39.000404508 +0200
|
||||||
|
@@ -36,7 +36,7 @@ let $wait_condition =
|
||||||
|
# depending on platform.
|
||||||
|
#
|
||||||
|
connection con1;
|
||||||
|
--- error 1317, 2006, 2013, ER_CONNECTION_KILLED
|
||||||
|
+-- error 1317, 2006, 2013, 2026, ER_CONNECTION_KILLED
|
||||||
|
reap;
|
||||||
|
connection default;
|
||||||
|
DROP TABLE bug51920;
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/mysql-test/main/lock_kill.test 2023-05-03 06:32:44.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/main/lock_kill.test 2023-07-07 15:13:54.335086789 +0200
|
||||||
|
@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE;
|
||||||
|
eval KILL $conid;
|
||||||
|
--enable_query_log
|
||||||
|
--connection con1
|
||||||
|
---error 0,2006,2013,ER_CONNECTION_KILLED
|
||||||
|
+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
|
||||||
|
reap;
|
||||||
|
--connection default
|
||||||
|
--disconnect con1
|
||||||
|
@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
|
||||||
|
eval KILL $conid;
|
||||||
|
--enable_query_log
|
||||||
|
--connection con1
|
||||||
|
---error 0,2006,2013,ER_CONNECTION_KILLED
|
||||||
|
+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
|
||||||
|
reap;
|
||||||
|
--connection default
|
||||||
|
--disconnect con1
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/mysql-test/main/loadxml.test 2023-05-03 06:32:44.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/mysql-test/main/loadxml.test 2023-07-07 15:15:14.862492763 +0200
|
||||||
|
@@ -83,7 +83,7 @@ connection default;
|
||||||
|
connection addconroot;
|
||||||
|
# Read response from connection to avoid packets out-of-order when disconnecting
|
||||||
|
# Note, that connection can already be dead due to previously issued kill
|
||||||
|
---error 0,2013
|
||||||
|
+--error 0,2013,2026
|
||||||
|
--reap
|
||||||
|
disconnect addconroot;
|
||||||
|
connection default;
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test 2023-05-03 06:32:45.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test 2023-07-10 11:48:28.859497746 +0200
|
||||||
|
@@ -1,3 +1,3 @@
|
||||||
|
--replace_regex /varchar\([0-9]+\)/varchar(pathlen)/
|
||||||
|
show create table information_schema.disks;
|
||||||
|
-select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
|
||||||
|
+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
|
||||||
|
|
||||||
|
--- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result 2023-05-03 06:32:45.000000000 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result 2023-07-10 12:47:10.460233056 +0200
|
||||||
|
@@ -7,6 +7,6 @@ DISKS CREATE TEMPORARY TABLE `DISKS` (
|
||||||
|
`Used` bigint(32) NOT NULL,
|
||||||
|
`Available` bigint(32) NOT NULL
|
||||||
|
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
|
||||||
|
-select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
|
||||||
|
-sum(Total) > sum(Available) sum(Total)>sum(Used)
|
||||||
|
+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
|
||||||
|
+sum(Total) >= sum(Available) sum(Total) >= sum(Used)
|
||||||
|
1 1
|
||||||
|
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
Harden the "hardened" flags even more to comply with RHEL8 security rules
|
||||||
|
|
||||||
|
--- mariadb-10.3.25/CMakeLists.txt 2020-10-05 18:19:45.000000000 +0200
|
||||||
|
+++ mariadb-10.3.25/CMakeLists.txt_patched 2020-11-03 01:29:52.369426705 +0100
|
||||||
|
@@ -247,7 +247,7 @@ IF(NOT WITH_TSAN)
|
||||||
|
# security-enhancing flags
|
||||||
|
MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
|
||||||
|
MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
|
||||||
|
- MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
|
||||||
|
+ MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong --param=ssp-buffer-size=4")
|
||||||
|
MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
|
||||||
|
ENDIF()
|
||||||
|
ENDIF()
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
--- mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:31:40.415022889 +0200
|
||||||
|
+++ ../../mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh 2023-08-11 11:32:01.924161077 +0200
|
||||||
|
@@ -340,6 +340,9 @@ get_transfer()
|
||||||
|
"Use workaround for socat $SOCAT_VERSION bug"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
+ if check_for_version "$SOCAT_VERSION" '1.7.4'; then
|
||||||
|
+ tcmd="$tcmd,no-sni=1"
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${sockopt#*,dhparam=}" = "$sockopt" ]; then
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
Use PCDIR CMake option, if configured
|
||||||
|
|
||||||
|
Upstream install the server pkgconfig file into arch-independent directory
|
||||||
|
Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
|
||||||
|
|
||||||
|
--- mariadb-10.3.12/support-files/CMakeLists.txt 2019-03-20 15:25:53.423283135 +0100
|
||||||
|
+++ mariadb-10.3.12/support-files/CMakeLists.txt_patched 2019-03-20 15:38:56.372819958 +0100
|
||||||
|
@@ -82,7 +82,12 @@ IF(UNIX)
|
||||||
|
|
||||||
|
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
|
||||||
|
CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
|
||||||
|
+IF(INSTALL_PCDIR)
|
||||||
|
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
|
||||||
|
+ELSE()
|
||||||
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
|
||||||
|
+ENDIF()
|
||||||
|
+
|
||||||
|
|
||||||
|
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test
|
|
||||||
--- mariadb-10.3.13/mysql-test/main/ssl_cipher.test 2019-02-20 08:59:09.000000000 +0100
|
|
||||||
+++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched 2019-02-22 11:22:01.250256060 +0100
|
|
||||||
@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost;
|
|
||||||
let $restart_parameters=--ssl-cipher=AES128-SHA;
|
|
||||||
source include/restart_mysqld.inc;
|
|
||||||
connect (ssl_con,localhost,root,,,,,SSL);
|
|
||||||
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
|
||||||
SHOW STATUS LIKE 'Ssl_cipher';
|
|
||||||
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
|
||||||
SHOW STATUS LIKE 'Ssl_cipher_list';
|
|
||||||
disconnect ssl_con;
|
|
||||||
connection default;
|
|
||||||
@ -1,5 +1,3 @@
|
|||||||
# Fails since 10.3.17, only on armv7hl
|
# Fails on aarch64
|
||||||
versioning.partition :
|
innodb.innodb_buffer_pool_resize :
|
||||||
|
innodb.innodb_buffer_pool_resize_with_chunks :
|
||||||
# Fail since 10.4.16 only on armv7hl
|
|
||||||
versioning.partition_rotation :
|
|
||||||
|
|||||||
@ -1,98 +1,27 @@
|
|||||||
# The SSL test are failing correctly. Fro more explanation, see:
|
# Fails everywhere
|
||||||
# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
|
innodb.innodb_defrag_binlog :
|
||||||
main.ssl_7937 : #1399847
|
|
||||||
main.ssl_8k_key :
|
|
||||||
main.ssl_crl : #1399847
|
|
||||||
|
|
||||||
# ------------------------------
|
main.ssl_7937 :
|
||||||
# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
|
main.ssl_8k_key :
|
||||||
perfschema.cnf_option :
|
main.ssl_crl :
|
||||||
|
main.ssl_system_ca :
|
||||||
|
main.userstat :
|
||||||
|
|
||||||
rpl.rpl_row_img_blobs :
|
perfschema.cnf_option :
|
||||||
rpl.rpl_row_img_eng_min :
|
perfschema.nesting :
|
||||||
rpl.rpl_row_img_eng_noblob :
|
|
||||||
|
|
||||||
sys_vars.slave_parallel_threads_basic :
|
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
|
|
||||||
plugins.auth_ed25519 :
|
|
||||||
plugins.multiauth :
|
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
perfschema.nesting : #1399847
|
|
||||||
perfschema.socket_summary_by_instance_func : #1399847
|
|
||||||
perfschema.socket_summary_by_event_name_func :
|
perfschema.socket_summary_by_event_name_func :
|
||||||
|
perfschema.socket_summary_by_instance_func :
|
||||||
|
|
||||||
# ------------------------------
|
plugins.feedback_plugin_load :
|
||||||
# Fails since 10.1.12
|
|
||||||
innodb.innodb_defrag_binlog :
|
|
||||||
|
|
||||||
# Fails everywhere since 10.2.15
|
|
||||||
main.userstat :
|
|
||||||
|
|
||||||
# Fails everywhere since 10.4.11
|
|
||||||
main.events_bugs :
|
|
||||||
sys_vars.tcp_nodelay :
|
|
||||||
|
|
||||||
# Fails on i686
|
|
||||||
encryption.innodb-redo-badkey :
|
|
||||||
|
|
||||||
# Fails since 10.5.2
|
|
||||||
main.mysqld--help2 :
|
|
||||||
disks.disks :
|
|
||||||
disks.disks_notembedded :
|
|
||||||
|
|
||||||
# Fails since 10.5.3
|
|
||||||
main.mysqld--help-aria :
|
|
||||||
|
|
||||||
# Fails since 10.5.4
|
|
||||||
main.ssl_system_ca :
|
|
||||||
|
|
||||||
# Fails since 10.5.7
|
|
||||||
innodb.innodb_wl6326_big :
|
|
||||||
plugins.feedback_plugin_load :
|
|
||||||
|
|
||||||
# Fails only on RHEL 9 BETA on i686 architecture
|
|
||||||
main.myisampack :
|
|
||||||
|
|
||||||
# Fails on all arches since 10.5.13 on CentOS Stream 9
|
rpl.rpl_row_img_blobs :
|
||||||
oqgraph.regression_mdev6345 :
|
rpl.rpl_row_img_eng_min :
|
||||||
type_test.type_test_double :
|
rpl.rpl_row_img_eng_noblob :
|
||||||
# Fails only on i686 since 10.5.13 on CentOS Stream 9
|
|
||||||
oqgraph.general-innodb :
|
|
||||||
oqgraph.general-Aria :
|
|
||||||
oqgraph.general-MyISAM :
|
|
||||||
oqgraph.legacy_upgrade :
|
|
||||||
oqgraph.regression_1133093 :
|
|
||||||
oqgraph.regression_1196036 :
|
|
||||||
oqgraph.regression_1213120 :
|
|
||||||
|
|
||||||
# Fails since RHEL 9.0.0 GA
|
sys_vars.slave_parallel_threads_basic :
|
||||||
# TLSv1.0 and TLSv1.1 are not allowed anymore
|
|
||||||
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/security_hardening/index
|
|
||||||
main.tls_version1 :
|
|
||||||
|
|
||||||
# Fails on all architectures since 10.5.18
|
# Fails only on i686
|
||||||
main.information_schema :
|
main.myisampack :
|
||||||
main.loadxml :
|
|
||||||
main.lock_kill :
|
|
||||||
|
|
||||||
# Fails since 10.5.20
|
# We don't build the plugin in server; we build it in mariadb-connector-c instead
|
||||||
innodb.innodb_bug51920 :
|
plugins.auth_ed25519 :
|
||||||
innodb.row_size_error_log_warnings_3 :
|
|
||||||
binlog_encryption.rpl_cant_read_event_incident :
|
|
||||||
bg.spider_fixes :
|
|
||||||
bugfix.mdev_29904 : "[Warning] mariadbd: Can't get hardware address with error 0"
|
|
||||||
sys_vars.completion_type_func :
|
|
||||||
rpl.rpl_report_port :
|
|
||||||
rpl.rpl_reset_slave_fail :
|
|
||||||
rpl.rpl_xa_survive_disconnect_lsu_off :
|
|
||||||
rpl.rpl_heartbeat_basic :
|
|
||||||
rpl.rpl_xa_survive_disconnect :
|
|
||||||
rpl.rpl_err_ignoredtable :
|
|
||||||
rpl.rpl_row_img_sequence_full :
|
|
||||||
rpl.rpl_row_img_sequence_min :
|
|
||||||
rpl.rpl_row_img_sequence_noblob :
|
|
||||||
rpl.rpl_xa_empty_transaction :
|
|
||||||
rpl.rpl_slave_shutdown_mdev20821 :
|
|
||||||
@ -1,7 +1,30 @@
|
|||||||
# Fails on ppc64le since 10.4.12
|
# Fails on ppc64le
|
||||||
oqgraph.social :
|
parts.partition_alter1_1_innodb :
|
||||||
|
parts.partition_alter1_2_innodb :
|
||||||
|
parts.partition_alter1_1_2_innodb :
|
||||||
|
parts.partition_alter1_2_1_innodb :
|
||||||
|
parts.partition_alter2_1_1_innodb :
|
||||||
|
parts.partition_alter1_2_2_innodb :
|
||||||
|
parts.partition_alter2_1_2_innodb :
|
||||||
|
parts.partition_alter2_2_1_innodb :
|
||||||
|
parts.partition_alter2_2_2_innodb :
|
||||||
|
parts.partition_alter4_innodb :
|
||||||
|
parts.partition_basic_innodb :
|
||||||
|
parts.part_supported_sql_func_innodb :
|
||||||
|
|
||||||
# Fails since 10.5.20
|
rpl.rpl_loaddata_m :
|
||||||
innodb.innodb_defrag_concurrent :
|
|
||||||
parts.partition_alter4_innodb :
|
#
|
||||||
rpl.rpl_parallel_optimistic_xa_lsu_off :
|
stress.ddl_innodb :
|
||||||
|
|
||||||
|
innodb.innodb_buffer_pool_resize :
|
||||||
|
innodb.innodb_buffer_pool_resize_with_chunks :
|
||||||
|
innodb.innodb_bulk_create_index :
|
||||||
|
innodb.innodb_defrag_binlog :
|
||||||
|
innodb.innodb_defrag_concurrent :
|
||||||
|
innodb_gis.kill_server :
|
||||||
|
gcol.innodb_virtual_basic :
|
||||||
|
|
||||||
|
# Unstable (randomly failing) tests
|
||||||
|
innodb_gis.rtree_search :
|
||||||
|
main.type_ranges :
|
||||||
|
|||||||
@ -1,3 +1,8 @@
|
|||||||
# Fails since 10.5.2
|
# Fails on s390x
|
||||||
perfschema.memory_aggregate_32bit :
|
disks.disks :
|
||||||
period.overlaps :
|
disks.disks_notembedded :
|
||||||
|
|
||||||
|
# related to MDEV-20194
|
||||||
|
# first check of `undefined` table causes warning,
|
||||||
|
# instead INSERT and ALTER should cause it
|
||||||
|
innodb.row_size_error_log_warnings_3 :
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue