diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index 3ca6f4231..d5c109f3d 100644
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@@ -3211,7 +3211,7 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 			if (match_regexes[0]->match(dig)) {
 				re2::RE2::Options *opt2=new re2::RE2::Options(RE2::Quiet);
 				opt2->set_case_sensitive(false);
-				char *pattern=(char *)"(?: *)SET *(?:|SESSION +|@@|@@session.)SQL_LOG_BIN *(?:|:)= *(\\d+) *(?:(|-- .*|#.*))$";
+				char *pattern=(char *)"(?: *)SET *(?:|SESSION +|@@|@@session.)SQL_LOG_BIN *(?:|:)= *(\\d+) *(?:(|;|-- .*|#.*))$";
 				re2::RE2 *re=new RE2(pattern, *opt2);
 				int i;
 				rc=RE2::PartialMatch(nq, *re, &i);
@@ -3238,7 +3238,7 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 				// set sql_mode
 				re2::RE2::Options *opt2=new re2::RE2::Options(RE2::Quiet);
 				opt2->set_case_sensitive(false);
-				char *pattern=(char *)"^(?: *)SET *(?:|SESSION +|@@|@@session.)SQL_MODE *(?:|:)= *(?:'||\")((\\w|,)*)(?:'||\") *(?:(|-- .*|#.*))$";
+				char *pattern=(char *)"^(?: *)SET *(?:|SESSION +|@@|@@session.)SQL_MODE *(?:|:)= *(?:'||\")((\\w|,)*)(?:'||\") *(?:(|;|-- .*|#.*))$";
 				re2::RE2 *re=new RE2(pattern, *opt2);
 				string s;
 				rc=RE2::PartialMatch(nq, *re, &s);
@@ -3273,7 +3273,7 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 				// set time_zone
 				re2::RE2::Options *opt2=new re2::RE2::Options(RE2::Quiet);
 				opt2->set_case_sensitive(false);
-				char *pattern=(char *)"^(?: *)SET *(?:|SESSION +|@@|@@session.)TIME_ZONE *(?:|:)= *(?:'||\")((\\w|/|:|\\d|\\+|-)*)(?:'||\") *(?:(|-- .*|#.*))$";
+				char *pattern=(char *)"^(?: *)SET *(?:|SESSION +|@@|@@session.)TIME_ZONE *(?:|:)= *(?:'||\")((\\w|/|:|\\d|\\+|-)*)(?:'||\") *(?:(|;|-- .*|#.*))$";
 				re2::RE2 *re=new RE2(pattern, *opt2);
 				string s;
 				rc=RE2::PartialMatch(nq, *re, &s);