Merge branch 'master' into execMultiple

Author: lance6716

mysql/const.go

@@ -167,3 +167,8 @@ const (
 	MySQLFlavor   = "mysql"
 	MariaDBFlavor = "mariadb"
 )
+
+const (
+	MYSQL_OPTION_MULTI_STATEMENTS_ON = iota
+	MYSQL_OPTION_MULTI_STATEMENTS_OFF
+)

mysql/mysql_gtid.go

@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"math"
 	"sort"
 	"strconv"
 	"strings"
@@ -234,11 +235,15 @@ func (s *UUIDSet) MinusInterval(in IntervalSlice) {
 	i, j := 0, 0
 	var minuend Interval
 	var subtrahend Interval
-	for j < len(in) && i < len(s.Intervals) {
+	for i < len(s.Intervals) {
 		if minuend.Stop != s.Intervals[i].Stop { // `i` changed?
 			minuend = s.Intervals[i]
 		}
-		subtrahend = in[j]
+		if j < len(in) {
+			subtrahend = in[j]
+		} else {
+			subtrahend = Interval{math.MaxInt64, math.MaxInt64}
+		}
 
 		if minuend.Stop <= subtrahend.Start {
 			// no overlapping
@@ -248,33 +253,25 @@ func (s *UUIDSet) MinusInterval(in IntervalSlice) {
 			// no overlapping
 			j++
 		} else {
-			if minuend.Start < subtrahend.Start && minuend.Stop < subtrahend.Stop {
+			if minuend.Start < subtrahend.Start && minuend.Stop <= subtrahend.Stop {
 				n = append(n, Interval{minuend.Start, subtrahend.Start})
 				i++
-			} else if minuend.Start > subtrahend.Start && minuend.Stop > subtrahend.Stop {
+			} else if minuend.Start >= subtrahend.Start && minuend.Stop > subtrahend.Stop {
 				minuend = Interval{subtrahend.Stop, minuend.Stop}
 				j++
 			} else if minuend.Start >= subtrahend.Start && minuend.Stop <= subtrahend.Stop {
 				// minuend is completely removed
 				i++
-			} else {
+			} else if minuend.Start < subtrahend.Start && minuend.Stop > subtrahend.Stop {
 				n = append(n, Interval{minuend.Start, subtrahend.Start})
 				minuend = Interval{subtrahend.Stop, minuend.Stop}
 				j++
+			} else {
+				panic("should never be here")
 			}
 		}
 	}
 
-	lastSub := in[len(in)-1]
-	for ; i < len(s.Intervals); i++ {
-		minuend = s.Intervals[i]
-		if minuend.Start < lastSub.Stop {
-			n = append(n, Interval{lastSub.Stop, minuend.Stop})
-		} else {
-			n = append(n, s.Intervals[i])
-		}
-	}
-
 	s.Intervals = n.Normalize()
 }
 

mysql/mysql_test.go

@@ -177,6 +177,9 @@ func (t *mysqlTestSuite) TestMysqlGTIDMinus(c *check.C) {
 		{"3E11FA47-71CA-11E1-9E33-C80AA9429562:20-57:60-90", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:20-22:24-57:60-90"},
 		{"3E11FA47-71CA-11E1-9E33-C80AA9429562:20-57:60-90", "3E11FA47-71CA-11E1-9E33-C80AA9429562:22-70", "3E11FA47-71CA-11E1-9E33-C80AA9429562:20-21:71-90"},
 		{"3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", ""},
+		{"3E11FA47-71CA-11E1-9E33-C80AA9429562:20-21", "3E11FA47-71CA-11E1-9E33-C80AA9429562:21", "3E11FA47-71CA-11E1-9E33-C80AA9429562:20"},
+		{"582A11ED-786C-11EC-ACCC-E0356662B76E:1-209692", "582A11ED-786C-11EC-ACCC-E0356662B76E:1-146519", "582A11ED-786C-11EC-ACCC-E0356662B76E:146520-209692"},
+		{"582A11ED-786C-11EC-ACCC-E0356662B76E:1-209692", "582A11ED-786C-11EC-ACCC-E0356662B76E:2-146519", "582A11ED-786C-11EC-ACCC-E0356662B76E:1:146520-209692"},
 	}
 
 	for _, tc := range testCases {