update: [MariaDB] updates

williamdes · Aug 31, 2024 · 0420c25 · 0420c25
1 parent 7bb167d
commit 0420c25
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 28 deletions.
diff --git a/data/variables/mariadb-replication-and-binary-log-server-system-variables.json b/data/variables/mariadb-replication-and-binary-log-server-system-variables.json
@@ -1074,7 +1074,7 @@
     },
     {
       "cli": "--slave-transaction_retry-errors=[error_code1,error_code2,...]",
-      "default": "1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5), 1213,1205 (>= MariaDB 10.3.3)",
+      "default": "1158,1159,1160,1161,1205,1213,1020,1429,2013,12701 (>= MariaDB 10.6.18, MariaDB 10.11.8, MariaDB 11.0.6, MariaDB 11.1.5, MariaDB 11.2.4, MariaDB 11.4.2), 1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5)",
       "dynamic": false,
       "id": "slave_transaction_retry_errors",
       "name": "slave_transaction_retry_errors",

diff --git a/data/variables/mariadb-semisynchronous-replication-system-variables.json b/data/variables/mariadb-semisynchronous-replication-system-variables.json
@@ -122,8 +122,8 @@
     {
       "cli": "--rpl-semi-sync-master=value",
       "default": "ON",
-      "id": "rpl_semi_sync_master",
-      "name": "rpl_semi_sync_master",
+      "id": "rpl-semi-sync_master",
+      "name": "rpl-semi-sync_master",
       "type": "enumeration",
       "validValues": [
         "OFF",
@@ -135,8 +135,8 @@
     {
       "cli": "--rpl-semi-sync-slave=value",
       "default": "ON",
-      "id": "rpl_semi_sync_slave",
-      "name": "rpl_semi_sync_slave",
+      "id": "rpl-semi-sync_slave",
+      "name": "rpl-semi-sync_slave",
       "type": "enumeration",
       "validValues": [
         "OFF",

diff --git a/data/variables/mariadb-xtradbinnodb-server-system-variables.json b/data/variables/mariadb-xtradbinnodb-server-system-variables.json
@@ -2731,6 +2731,18 @@
       ],
       "type": "integer"
     },
+    {
+      "cli": "--innodb-snapshot-isolation={0|1}",
+      "default": "OFF",
+      "dynamic": true,
+      "id": "innodb_snapshot_isolation",
+      "name": "innodb_snapshot_isolation",
+      "scope": [
+        "global",
+        "session"
+      ],
+      "type": "boolean"
+    },
     {
       "cli": "--innodb-sort-buffer-size=#",
       "default": "1048576",

diff --git a/dist/merged-raw.json b/dist/merged-raw.json
@@ -12670,7 +12670,7 @@
         },
         "slave_transaction_retry_errors": {
             "cli": "--slave-transaction_retry-errors=[error_code1,error_code2,...]",
-            "default": "1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5), 1213,1205 (>= MariaDB 10.3.3)",
+            "default": "1158,1159,1160,1161,1205,1213,1020,1429,2013,12701 (>= MariaDB 10.6.18, MariaDB 10.11.8, MariaDB 11.0.6, MariaDB 11.1.5, MariaDB 11.2.4, MariaDB 11.4.2), 1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5)",
             "dynamic": false,
             "name": "slave_transaction_retry_errors",
             "scope": [
@@ -14215,10 +14215,10 @@
                 }
             ]
         },
-        "rpl_semi_sync_master": {
+        "rpl-semi-sync_master": {
             "cli": "--rpl-semi-sync-master=value",
             "default": "ON",
-            "name": "rpl_semi_sync_master",
+            "name": "rpl-semi-sync_master",
             "type": "enumeration",
             "validValues": [
                 "OFF",
@@ -14228,15 +14228,15 @@
             ],
             "ids": [
                 {
-                    "anchor": "rpl_semi_sync_master",
+                    "anchor": "rpl-semi-sync_master",
                     "url": "https://mariadb.com/kb/en/semisynchronous-replication/"
                 }
             ]
         },
-        "rpl_semi_sync_slave": {
+        "rpl-semi-sync_slave": {
             "cli": "--rpl-semi-sync-slave=value",
             "default": "ON",
-            "name": "rpl_semi_sync_slave",
+            "name": "rpl-semi-sync_slave",
             "type": "enumeration",
             "validValues": [
                 "OFF",
@@ -14246,7 +14246,7 @@
             ],
             "ids": [
                 {
-                    "anchor": "rpl_semi_sync_slave",
+                    "anchor": "rpl-semi-sync_slave",
                     "url": "https://mariadb.com/kb/en/semisynchronous-replication/"
                 }
             ]
@@ -38524,6 +38524,23 @@
                 }
             ]
         },
+        "innodb_snapshot_isolation": {
+            "cli": "--innodb-snapshot-isolation={0|1}",
+            "default": "OFF",
+            "dynamic": true,
+            "name": "innodb_snapshot_isolation",
+            "scope": [
+                "global",
+                "session"
+            ],
+            "type": "boolean",
+            "ids": [
+                {
+                    "anchor": "innodb_snapshot_isolation",
+                    "url": "https://mariadb.com/kb/en/innodb-system-variables/"
+                }
+            ]
+        },
         "innodb_sort_buffer_size": {
             "cli": "--innodb-sort-buffer-size=#",
             "default": "1048576",

diff --git a/dist/merged-raw.md b/dist/merged-raw.md
@@ -10634,7 +10634,7 @@
 |Command line|`--slave-transaction_retry-errors=[error_code1,error_code2,...]`|
 |Type of variable|`string`|
 |Scope|`global`|
-|Default value|`1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5), 1213,1205 (>= MariaDB 10.3.3)`|
+|Default value|`1158,1159,1160,1161,1205,1213,1020,1429,2013,12701 (>= MariaDB 10.6.18, MariaDB 10.11.8, MariaDB 11.0.6, MariaDB 11.1.5, MariaDB 11.2.4, MariaDB 11.4.2), 1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5)`|
 |Dynamic|`false`|
 |Valid value(s)|`comma-separated list of error codes`|
 
@@ -11877,10 +11877,10 @@
 |mariadb.com|[rpl_semi_sync_slave_trace_level](https://mariadb.com/kb/en/semisynchronous-replication/#rpl_semi_sync_slave_trace_level)|
 |dev.mysql.com|[sysvar_rpl_semi_sync_slave_trace_level](https://dev.mysql.com/doc/refman/8.0/en/replication-options-replica.html#sysvar_rpl_semi_sync_slave_trace_level)|
 
-## rpl_semi_sync_master
+## rpl-semi-sync_master
 |name|value|
 |----|-----|
-|Name|`rpl_semi_sync_master`|
+|Name|`rpl-semi-sync_master`|
 |Command line|`--rpl-semi-sync-master=value`|
 |Type of variable|`enumeration`|
 |Default value|`ON`|
@@ -11889,12 +11889,12 @@
 ### Documentation(s)
 |source|anchor name|
 |------|----|
-|mariadb.com|[rpl_semi_sync_master](https://mariadb.com/kb/en/semisynchronous-replication/#rpl_semi_sync_master)|
+|mariadb.com|[rpl-semi-sync_master](https://mariadb.com/kb/en/semisynchronous-replication/#rpl-semi-sync_master)|
 
-## rpl_semi_sync_slave
+## rpl-semi-sync_slave
 |name|value|
 |----|-----|
-|Name|`rpl_semi_sync_slave`|
+|Name|`rpl-semi-sync_slave`|
 |Command line|`--rpl-semi-sync-slave=value`|
 |Type of variable|`enumeration`|
 |Default value|`ON`|
@@ -11903,7 +11903,7 @@
 ### Documentation(s)
 |source|anchor name|
 |------|----|
-|mariadb.com|[rpl_semi_sync_slave](https://mariadb.com/kb/en/semisynchronous-replication/#rpl_semi_sync_slave)|
+|mariadb.com|[rpl-semi-sync_slave](https://mariadb.com/kb/en/semisynchronous-replication/#rpl-semi-sync_slave)|
 
 ## Aborted_clients
 |name|value|
@@ -31161,6 +31161,21 @@
 |------|----|
 |mariadb.com|[innodb_simulate_comp_failures](https://mariadb.com/kb/en/innodb-system-variables/#innodb_simulate_comp_failures)|
 
+## innodb_snapshot_isolation
+|name|value|
+|----|-----|
+|Name|`innodb_snapshot_isolation`|
+|Command line|`--innodb-snapshot-isolation={0|1}`|
+|Type of variable|`boolean`|
+|Scope|`global`, `session`|
+|Default value|`OFF`|
+|Dynamic|`true`|
+
+### Documentation(s)
+|source|anchor name|
+|------|----|
+|mariadb.com|[innodb_snapshot_isolation](https://mariadb.com/kb/en/innodb-system-variables/#innodb_snapshot_isolation)|
+
 ## innodb_sort_buffer_size
 |name|value|
 |----|-----|

diff --git a/dist/merged-slim.json b/dist/merged-slim.json
@@ -10003,7 +10003,7 @@
         },
         "slave_transaction_retry_errors": {
             "cli": "--slave-transaction_retry-errors=[error_code1,error_code2,...]",
-            "default": "1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5), 1213,1205 (>= MariaDB 10.3.3)",
+            "default": "1158,1159,1160,1161,1205,1213,1020,1429,2013,12701 (>= MariaDB 10.6.18, MariaDB 10.11.8, MariaDB 11.0.6, MariaDB 11.1.5, MariaDB 11.2.4, MariaDB 11.4.2), 1158,1159,1160,1161,1205,1213,1429,2013,12701 (>= MariaDB 10.4.5)",
             "dynamic": false,
             "name": "slave_transaction_retry_errors",
             "scope": [
@@ -11086,10 +11086,10 @@
                 "38#sysvar_rpl_semi_sync_slave_trace_level"
             ]
         },
-        "rpl_semi_sync_master": {
+        "rpl-semi-sync_master": {
             "cli": "--rpl-semi-sync-master=value",
             "default": "ON",
-            "name": "rpl_semi_sync_master",
+            "name": "rpl-semi-sync_master",
             "type": "enumeration",
             "validValues": [
                 "OFF",
@@ -11098,13 +11098,13 @@
                 "FORCE_PLUS_PERMANENT"
             ],
             "ids": [
-                "44#rpl_semi_sync_master"
+                "44#rpl-semi-sync_master"
             ]
         },
-        "rpl_semi_sync_slave": {
+        "rpl-semi-sync_slave": {
             "cli": "--rpl-semi-sync-slave=value",
             "default": "ON",
-            "name": "rpl_semi_sync_slave",
+            "name": "rpl-semi-sync_slave",
             "type": "enumeration",
             "validValues": [
                 "OFF",
@@ -11113,7 +11113,7 @@
                 "FORCE_PLUS_PERMANENT"
             ],
             "ids": [
-                "44#rpl_semi_sync_slave"
+                "44#rpl-semi-sync_slave"
             ]
         },
         "Aborted_clients": {
@@ -28504,6 +28504,20 @@
                 "62#innodb_simulate_comp_failures"
             ]
         },
+        "innodb_snapshot_isolation": {
+            "cli": "--innodb-snapshot-isolation={0|1}",
+            "default": "OFF",
+            "dynamic": true,
+            "name": "innodb_snapshot_isolation",
+            "scope": [
+                "global",
+                "session"
+            ],
+            "type": "boolean",
+            "ids": [
+                "62#innodb_snapshot_isolation"
+            ]
+        },
         "innodb_sort_buffer_size": {
             "cli": "--innodb-sort-buffer-size=#",
             "default": "1048576",

diff --git a/dist/merged-ultraslim.json b/dist/merged-ultraslim.json
diff --git a/dist/merged-ultraslim.php b/dist/merged-ultraslim.php