aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/mysql/mariadb.inc
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2021-11-22 16:54:08 +0800
committerKhem Raj <raj.khem@gmail.com>2021-11-22 10:15:00 -0800
commit3d553c8fdfa65706aeeeb907410408958b16b086 (patch)
tree6f195bb90624a1f5fba5250d16b38b7fa205923e /meta-oe/recipes-dbs/mysql/mariadb.inc
parentbbad57ecc64d566d27a03545f0b9a2e02cb902f5 (diff)
downloadmeta-openembedded-contrib-3d553c8fdfa65706aeeeb907410408958b16b086.tar.gz
mariadb: Fix openssl 3.x compatibility
Backport a patch [1] to fix the below mariadb crash issue which related to compatibility with openssl 3.x. # mysql_install_db --basedir=/usr Installing MariaDB/MySQL system tables in '/var/lib/mysql' ... /usr/bin/mysql_install_db: line 525: 430 Aborted "$mysqld_bootstrap" $defaults $defaults_group_suffix "$mysqld_opt" --bootstrap $silent_startup "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --enforce-storage-engine="" "--plugin-dir=${plugindir}" $args --max_allowed_packet=8M --net_buffer_length=16K Installation of system tables failed! Examine the logs in /var/log/mysqld.log or /var/lib/mysql for more information. [snip] # cat /var/log/mysqld.log [snip] Thread pointer: 0x55e203ab6d98 Attempting backtrace. You can use the following information to find out where mysqld died. If you see no messages after this, something went terribly wrong... stack_bottom = 0x7ffd0c35dd18 thread_stack 0x49000 /usr/sbin/mariadbd(my_print_stacktrace+0x2e)[0x55e2027e533e] /usr/sbin/mariadbd(handle_fatal_signal+0x478)[0x55e20233eac8] libc_sigaction.c:0(__restore_rt)[0x7fbdf353b8f0] nptl/pthread_kill.c:46(__pthread_kill_internal)[0x7fbdf3586693] posix/raise.c:27(__GI_raise)[0x7fbdf353b846] stdlib/abort.c:81(__GI_abort)[0x7fbdf35267a3] posix/libc_fatal.c:161(__GI___libc_fatal)[0x7fbdf357ae50] debug/fortify_fail.c:25(__GI___fortify_fail)[0x7fbdf3613c4a] :0(__stack_chk_fail_local)[0x7fbdf3613c14] /usr/sbin/mariadbd(+0xacc8b5)[0x55e20253f8b5] mysys_ssl/my_md5.cc:92(my_md5)[0x55e202203533] /usr/sbin/mariadbd(_Z17mysql_create_viewP3THDP10TABLE_LIST21enum_view_create_mode+0x9e1)[0x55e2021f44b1] /usr/sbin/mariadbd(_Z21mysql_execute_commandP3THDb+0x2249)[0x55e202131f79] /usr/sbin/mariadbd(_Z11mysql_parseP3THDPcjP12Parser_state+0x1d8)[0x55e202135098] sql/table.cc:5635(TABLE_LIST::calc_md5(char const*))[0x55e20213546e] sql/sql_class.h:1219(Query_arena::memdup(void const*, unsigned long))[0x55e202073dee] nptl/libc_start_call_main.h:58(__libc_start_call_main)[0x7fbdf352751b] csu/libc-start.c:128(call_init)[0x7fbdf35275cc] /usr/sbin/mariadbd(_start+0x25)[0x55e2020686b5] [snip] [1] https://github.com/MariaDB/server/commit/1b238e343506b43825092941d4cd294d9b866bef Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb.inc')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 81a7859323..51e6ddbf71 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -20,6 +20,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
file://ssize_t.patch \
file://mm_malloc.patch \
file://sys_futex.patch \
+ file://0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch \
"
SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"