MDEV-34716 [to-squash] Fix collate of the newly added Options column

The MDEV-25829 patch causes the mysql.servers table to be converted to
utf8mb3_general_ci.

mysql-test/main/system_mysql_db_fix40123.result

@@ -171,7 +171,7 @@ servers	CREATE TABLE `servers` (
   `Socket` char(108) NOT NULL DEFAULT '',
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` varchar(512) NOT NULL DEFAULT '',
-  `Options` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
+  `Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
   PRIMARY KEY (`Server_name`)
 ) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;

mysql-test/main/system_mysql_db_fix50117.result

@@ -155,7 +155,7 @@ servers	CREATE TABLE `servers` (
   `Socket` char(108) NOT NULL DEFAULT '',
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` varchar(512) NOT NULL DEFAULT '',
-  `Options` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
+  `Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
   PRIMARY KEY (`Server_name`)
 ) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;

mysql-test/main/system_mysql_db_fix50568.result

@@ -176,7 +176,7 @@ servers	CREATE TABLE `servers` (
   `Socket` char(108) NOT NULL DEFAULT '',
   `Wrapper` char(64) NOT NULL DEFAULT '',
   `Owner` varchar(512) NOT NULL DEFAULT '',
-  `Options` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
+  `Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
   PRIMARY KEY (`Server_name`)
 ) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
 show create table proc;

scripts/mariadb_system_tables_fix.sql

@@ -905,3 +905,6 @@ ALTER TABLE servers
 # MDEV-34716 Allow arbitrary options in CREATE SERVER
 ALTER TABLE servers
   ADD Options JSON NOT NULL DEFAULT '{}' CHECK(JSON_VALID(Options));
+# Ensure the collation is utf8mb4_bin (default for JSON)
+ALTER TABLE servers
+  MODIFY Options JSON  NOT NULL DEFAULT '{}' CHECK(JSON_VALID(Options));