After-merge fixes

These were broken in commit 504a3b3

Author: dr-m

debian/control

@@ -442,7 +442,6 @@ Breaks: mariadb-client-core-10.0,
         mariadb-client-core-10.6,
         mariadb-client-core-10.7,
         mariadb-client-core-10.8,
-        mariadb-client-core-10.9,
         mariadb-client-core (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
@@ -453,7 +452,6 @@ Breaks: mariadb-client-core-10.0,
         mariadb-server-10.6,
         mariadb-server-10.7,
         mariadb-server-10.8,
-        mariadb-server-10.9,
         mariadb-server (<< ${source:Version}),
         mariadb-server-core-10.0,
         mariadb-server-core-10.1,
@@ -601,7 +599,6 @@ Breaks: mariadb-client-10.0,
         mariadb-client-10.6,
         mariadb-client-10.7,
         mariadb-client-10.8,
-        mariadb-client-10.9,
         mariadb-client (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
@@ -611,7 +608,6 @@ Breaks: mariadb-client-10.0,
         mariadb-server-10.6,
         mariadb-server-10.7,
         mariadb-server-10.8,
-        mariadb-server-10.9,
         mariadb-server (<< ${source:Version}),
         mysql-client-5.5,
         mysql-server-5.5,

storage/spider/spd_table.cc

@@ -2379,8 +2379,10 @@ int spider_parse_connect_info(
           SPIDER_PARAM_DEPRECATED_WARNING("sts_mode");
           SPIDER_PARAM_INT_WITH_MAX("sts_mode", sts_mode, 1, 2);
           SPIDER_PARAM_INT_WITH_MAX("sts_sync", sts_sync, 0, 2);
+          SPIDER_PARAM_DEPRECATED_WARNING("crd_mode");
           SPIDER_PARAM_INT_WITH_MAX("crd_mode", crd_mode, 0, 3);
           SPIDER_PARAM_INT_WITH_MAX("crd_sync", crd_sync, 0, 2);
+          SPIDER_PARAM_DEPRECATED_WARNING("crd_type");
           SPIDER_PARAM_INT_WITH_MAX("crd_type", crd_type, 0, 2);
           SPIDER_PARAM_LONGLONG("priority", priority, 0);
           SPIDER_PARAM_INT("bgs_mode", bgs_mode, 0);