database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/sp-error.test
View File

@ -12,8 +12,10 @@ drop table if exists t1, t2;
# Backup the mysql.proc table
--enable_prepare_warnings
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--disable_cursor_protocol
eval SELECT * FROM mysql.proc INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/proc.txt';
--disable_prepare_warnings
--enable_cursor_protocol
--enable_ps2_protocol
# Make sure we don't have any procedures left.
delete from mysql.proc;