diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
index f02cf3824..bcb8973ea 100644
--- a/lib/mysql_connection.cpp
+++ b/lib/mysql_connection.cpp
@@ -1067,7 +1067,7 @@ void MySQL_Connection::ProcessQueryAndSetStatusFlags(char *query_digest_text) {
 		}
 	}
 	if (get_status_lock_tables()==false) { // we search for lock tables only if not already set
-		if (!strncasecmp(query_digest_text,"LOCK TABLES", strlen("LOCK TABLES"))) {
+		if (!strncasecmp(query_digest_text,"LOCK TABLE", strlen("LOCK TABLE"))) {
 			set_status_lock_tables(true);
 		}
 	}
diff --git a/test/check_result.py b/test/check_result.py
new file mode 100644
index 000000000..d387159eb
--- /dev/null
+++ b/test/check_result.py
@@ -0,0 +1,36 @@
+import sys
+import MySQLdb
+
+
+def execute(conn, sql):
+    select = True
+    if not sql.startswith('SELECT') and not sql.startswith('SHOW'):
+        select = False
+
+    curs = conn.cursor(MySQLdb.cursors.SSDictCursor)
+    curs.execute(sql)
+    if select:
+        rows = curs.fetchall()
+        curs.close()
+        return select, rows
+
+    ret = conn.affected_rows()
+    curs.close()
+    return select, ret
+
+if __name__ == '__main__':
+  assert len(sys.argv) == 6
+  user = sys.argv[1]
+  passwd = sys.argv[2]
+  db = sys.argv[3]
+  host = sys.argv[4]
+  port = sys.argv[5]
+
+  conn = MySQLdb.connect(host=host, port=int(port), user=user, passwd=passwd, db=db)
+  conn.autocommit(False)
+  for line in sys.stdin:
+    print line.rstrip()
+    (select, rows) = execute(conn,line.rstrip())
+    if select:
+      for row in rows:
+        print row