Merge pull request #125 from Jolg42/patch-1

blackbeam · web-flow · commit 48ed958051d9 · 2024-02-13T17:28:18.000+03:00
fix: update MariaDB version regex to make the version hack optional
diff --git a/src/packets/mod.rs b/src/packets/mod.rs
@@ -45,7 +45,7 @@ use self::session_state_change::SessionStateChange;
 
 lazy_static::lazy_static! {
     static ref MARIADB_VERSION_RE: Regex =
-        Regex::new(r"^5.5.5-(\d{1,2})\.(\d{1,2})\.(\d{1,3})-MariaDB").unwrap();
+        Regex::new(r"^(?:5.5.5-)?(\d{1,2})\.(\d{1,2})\.(\d{1,3})-MariaDB").unwrap();
     static ref VERSION_RE: Regex = Regex::new(r"^(\d{1,2})\.(\d{1,2})\.(\d{1,3})(.*)").unwrap();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ use self::session_state_change::SessionStateChange;`
`45`	`45`
`46`	`46`	`lazy_static::lazy_static! {`
`47`	`47`	`static ref MARIADB_VERSION_RE: Regex =`
`48`		`- Regex::new(r"^5.5.5-(\d{1,2})\.(\d{1,2})\.(\d{1,3})-MariaDB").unwrap();`
	`48`	`+ Regex::new(r"^(?:5.5.5-)?(\d{1,2})\.(\d{1,2})\.(\d{1,3})-MariaDB").unwrap();`
`49`	`49`	`static ref VERSION_RE: Regex = Regex::new(r"^(\d{1,2})\.(\d{1,2})\.(\d{1,3})(.*)").unwrap();`
`50`	`50`	`}`
`51`	`51`