[misc] restrict capabilities to server capabilities

mariadb-corporation · Oct 12, 2023 · e8b4b56 · e8b4b56
1 parent f2fff31
commit e8b4b56
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/lib/cmd/handshake/client-capabilities.js b/lib/cmd/handshake/client-capabilities.js
@@ -24,11 +24,8 @@ module.exports.init = function (opts, info) {
     Capabilities.SESSION_TRACK |
     Capabilities.CONNECT_ATTRS |
     Capabilities.PLUGIN_AUTH_LENENC_CLIENT_DATA |
-    Capabilities.MARIADB_CLIENT_EXTENDED_TYPE_INFO;
-
-  if (info.serverCapabilities & Capabilities.PLUGIN_AUTH) {
-    capabilities |= Capabilities.PLUGIN_AUTH;
-  }
+    Capabilities.MARIADB_CLIENT_EXTENDED_TYPE_INFO |
+    Capabilities.PLUGIN_AUTH;
 
   if (opts.foundRows) {
     capabilities |= Capabilities.FOUND_ROWS;
@@ -65,14 +62,13 @@ module.exports.init = function (opts, info) {
     }
   }
 
-  if (opts.bulk) {
-    if (info.serverCapabilities & Capabilities.MARIADB_CLIENT_STMT_BULK_OPERATIONS) {
-      capabilities |= Capabilities.MARIADB_CLIENT_STMT_BULK_OPERATIONS;
-    }
+  if (opts.bulk && info.serverCapabilities & Capabilities.MARIADB_CLIENT_STMT_BULK_OPERATIONS) {
+    capabilities |= Capabilities.MARIADB_CLIENT_STMT_BULK_OPERATIONS;
   }
 
   if (opts.permitConnectionWhenExpired) {
     capabilities |= Capabilities.CAN_HANDLE_EXPIRED_PASSWORDS;
   }
-  info.clientCapabilities = capabilities;
+
+  info.clientCapabilities = capabilities & info.serverCapabilities;
 };