database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-04 07:55:16 +03:00
parent 56990b18d9 bbd70fcc43
commit 9a7948e3f6
472 changed files with 12262 additions and 4832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/std_data/ldml/Index.xml
View File

@ -362,7 +362,14 @@
<alias>iso_8859-1:1987</alias>
<alias>l1</alias>
<alias>latin1</alias>
<collation name="latin1_test" id="99" order="test"/>
<!--
The server rejects binding an existing built-in collation
to a different character set through Index.xml.
This example tries to override cp1250_polish_ci with id 99
and bind it to latin1:
-->
<collation name="latin1_test_replace" id="99"/>
<collation name="latin1_test" id="331" order="test"/>
<collation name="latin1_test2" id="332" order="test"/>
<collation name="latin1_test2_cs" id="333"/>
<collation name="latin1_swedish_nopad2_ci" id="334" flag="nopad">

18
mysql-test/std_data/wsrep_notify.sh
View File

@ -56,7 +56,7 @@ configuration_change()
status_update()
{
echo "SET wsrep_on=0; BEGIN; UPDATE $STATUS_TABLE SET status='$STATUS'; COMMIT;"
echo "$BEGIN; UPDATE $STATUS_TABLE SET status='$STATUS'; $END;"
}
COM=status_update # not a configuration change by default
@ -89,11 +89,11 @@ do
shift
done
# Undefined means node is shutting down
if [ "$STATUS" != "Undefined" ]
then
$COM | mysql -B -u$USER -h$HOST -P$PORT
fi
exit 0
#
case $STATUS in
"joined" | "donor" | "synced")
$COM | mysql -B -u$USER -h$HOST -P$PORT
;;
*)
exit 0
;;
esac