diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-04 07:55:16 +0300 |
| commit | 9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35 (patch) | |
| tree | 68f8e54f6c2484dc7791bee8c594d3d07c611d29 /mysql-test/std_data | |
| parent | 56990b18d914b8150c9f777d134724d2b3390360 (diff) | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| download | mariadb-git-9a7948e3f6d3fd7528e49f43eb4d41f8f55c8a35.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/ldml/Index.xml | 9 | ||||
| -rwxr-xr-x | mysql-test/std_data/wsrep_notify.sh | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/mysql-test/std_data/ldml/Index.xml b/mysql-test/std_data/ldml/Index.xml index 0435b2ab689..c4b91535af6 100644 --- a/mysql-test/std_data/ldml/Index.xml +++ b/mysql-test/std_data/ldml/Index.xml @@ -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"> diff --git a/mysql-test/std_data/wsrep_notify.sh b/mysql-test/std_data/wsrep_notify.sh index 7036f603c84..48edad4306f 100755 --- a/mysql-test/std_data/wsrep_notify.sh +++ b/mysql-test/std_data/wsrep_notify.sh @@ -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 |