Use mysql.proc with MariaDB. Fixes #1547

bgrainger · bgrainger · commit a9709c4285d0 · 2025-02-08T13:30:44.000-08:00
Signed-off-by: Bradley Grainger &lt;bgrainger@gmail.com&gt;
diff --git a/src/MySqlConnector/Core/CachedProcedure.cs b/src/MySqlConnector/Core/CachedProcedure.cs
@@ -13,9 +13,8 @@ internal sealed class CachedProcedure
 	public static async Task<CachedProcedure?> FillAsync(IOBehavior ioBehavior, MySqlConnection connection, string schema, string component, ILogger logger, CancellationToken cancellationToken)
 	{
 		// try to use mysql.proc first, as it is much faster
-		if (!connection.Session.ServerVersion.IsMariaDb &&
-			connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable &&
-			!connection.Session.ProcAccessDenied)
+		if (!connection.Session.ProcAccessDenied &&
+			(connection.Session.ServerVersion.IsMariaDb || connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable))
 		{
 			try
 			{

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ internal sealed class CachedProcedure`
`13`	`13`	`public static async Task<CachedProcedure?> FillAsync(IOBehavior ioBehavior, MySqlConnection connection, string schema, string component, ILogger logger, CancellationToken cancellationToken)`
`14`	`14`	`{`
`15`	`15`	`// try to use mysql.proc first, as it is much faster`
`16`		`- if (!connection.Session.ServerVersion.IsMariaDb &&`
`17`		`- connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable &&`
`18`		`- !connection.Session.ProcAccessDenied)`
	`16`	`+ if (!connection.Session.ProcAccessDenied &&`
	`17`	`+ (connection.Session.ServerVersion.IsMariaDb \|\| connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable))`
`19`	`18`	`{`
`20`	`19`	`try`
`21`	`20`	`{`