use MySQL parser instead of QuerySplitter

conn.go

@@ -5,10 +5,12 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"github.com/dolthub/dolt/go/cmd/dolt/commands/engine"
-	gms "github.com/dolthub/go-mysql-server/sql"
 	"io"
 	"time"
+
+	"github.com/dolthub/dolt/go/cmd/dolt/commands/engine"
+
+	gms "github.com/dolthub/go-mysql-server/sql"
 )
 
 var _ driver.Conn = (*DoltConn)(nil)
@@ -25,20 +27,21 @@ func (d *DoltConn) Prepare(query string) (driver.Stmt, error) {
 	multiStatements := d.DataSource.ParamIsTrue(MultiStatementsParam)
 
 	if multiStatements {
-		qs := NewQuerySplitter(query)
-		current, err := qs.Next()
-		if err != io.EOF && err != nil {
+		scanner := gms.NewMysqlParser()
+		parsed, prequery, remainder, err := scanner.Parse(d.gmsCtx, query, true)
+		if err != nil {
 			return nil, translateError(err)
 		}
 
-		for len(current) > 0 {
-			if !qs.HasMore() {
+		for {
+			if len(remainder) == 0 {
+				query = prequery
 				break
 			}
-			d.se.GetUnderlyingEngine()
 
 			err = func() error {
-				_, rowIter, err := d.se.Query(d.gmsCtx, current)
+				var rowIter gms.RowIter
+				_, rowIter, err = d.se.GetUnderlyingEngine().QueryWithBindings(d.gmsCtx, prequery, parsed, nil)
 				if err != nil {
 					return translateError(err)
 				}
@@ -59,13 +62,14 @@ func (d *DoltConn) Prepare(query string) (driver.Stmt, error) {
 				return nil, err
 			}
 
-			current, err = qs.Next()
+			parsed, prequery, remainder, err = scanner.Parse(d.gmsCtx, remainder, true)
 			if err != nil {
-				return nil, err
+				return nil, translateError(err)
 			}
 		}
-
-		query = current
+		if prequery != "" {
+			query = prequery
+		}
 	}
 
 	if len(query) > 0 {

smoke_test.go

@@ -57,6 +57,46 @@ func TestMultiStatements(t *testing.T) {
 	require.NoError(t, conn.Close())
 }
 
+func TestMultiStatementsStoredProc(t *testing.T) {
+	conn, cleanupFunc := initializeTestDatabaseConnection(t, false)
+	defer cleanupFunc()
+
+	ctx := context.Background()
+	rows, err := conn.QueryContext(ctx, "create procedure p() begin select 1; end; call p(); call p(); call p();")
+	require.NoError(t, err)
+	for rows.Next() {
+		var i int
+		err = rows.Scan(&i)
+		require.NoError(t, err)
+		require.Equal(t, 1, i)
+	}
+	require.NoError(t, rows.Err())
+	require.NoError(t, rows.Close())
+}
+
+func TestMultiStatementsTrigger(t *testing.T) {
+	conn, cleanupFunc := initializeTestDatabaseConnection(t, false)
+	defer cleanupFunc()
+
+	ctx := context.Background()
+	res, err := conn.ExecContext(ctx, "create table t (i int primary key, j int);")
+	require.NoError(t, err)
+	_, err = res.RowsAffected()
+	require.NoError(t, err)
+
+	rows, err := conn.QueryContext(ctx, "create trigger trig before insert on t for each row begin set new.j = new.j * 100; end; insert into t values (1, 2); select * from t;")
+	require.NoError(t, err)
+	for rows.Next() {
+		var i, j int
+		err = rows.Scan(&i, &j)
+		require.NoError(t, err)
+		require.Equal(t, 1, i)
+		require.Equal(t, 200, j)
+	}
+	require.NoError(t, rows.Err())
+	require.NoError(t, rows.Close())
+}
+
 // TestClientFoundRows asserts that the number of affected rows reported for a query
 // correctly reflects whether the CLIENT_FOUND_ROWS capability is set or not.
 func TestClientFoundRows(t *testing.T) {