Removing last mentions of mysqlconn.

go/mysql/client_test.go

@@ -119,7 +119,7 @@ func TestConnectTimeout(t *testing.T) {
 	// Tests a connection where Dial to a unix socket fails
 	// properly returns the right error. To simulate exactly the
 	// right failure, try to dial a Unix socket that's just a temp file.
-	fd, err := ioutil.TempFile("", "mysqlconn")
+	fd, err := ioutil.TempFile("", "mysql")
 	if err != nil {
 		t.Fatalf("cannot create TemFile: %v", err)
 	}

go/mysql/replication_constants.go

@@ -20,9 +20,6 @@ package mysql
 
 // This is the data type for a field.
 // Values taken from include/mysql/mysql_com.h
-// FIXME(alainjobart) this is the same info as constants describes in
-// the go/mysql package. We will remove that package, and merge this
-// package with go/mysqlconn as asoon as we can.
 const (
 	// TypeDecimal is MYSQL_TYPE_DECIMAL. It is deprecated.
 	TypeDecimal = 0

go/vt/dbconfigs/dbconfigs.go

@@ -55,7 +55,7 @@ const redactedPassword = "****"
 
 // The flags will change the global singleton
 func registerConnFlags(connParams *mysql.ConnParams, name string) {
-	flag.StringVar(&connParams.Engine, "db-config-"+name+"-engine", "mysqlconn", "db "+name+" engine to use (empty for default, libmysqlclient or mysqlconn)")
+	flag.StringVar(&connParams.Engine, "db-config-"+name+"-engine", "", "DEPRECATED: db "+name+" engine to use")
 	flag.StringVar(&connParams.Host, "db-config-"+name+"-host", "", "db "+name+" connection host")
 	flag.IntVar(&connParams.Port, "db-config-"+name+"-port", 0, "db "+name+" connection port")
 	flag.StringVar(&connParams.Uname, "db-config-"+name+"-uname", "", "db "+name+" connection uname")

go/vt/vttablet/tabletserver/query_executor_test.go

@@ -790,11 +790,6 @@ func TestQueryExecutorPlanOtherWithinATransaction(t *testing.T) {
 	if err != nil {
 		t.Fatalf("qre.Execute() = %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, field := range got.Fields {
-		field.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("got: %v, want: %v", got, want)
 	}
@@ -832,11 +827,6 @@ func TestQueryExecutorPlanPassSelectWithInATransaction(t *testing.T) {
 	if err != nil {
 		t.Fatalf("qre.Execute() = %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, field := range got.Fields {
-		field.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("got: %v, want: %v", got, want)
 	}
@@ -888,11 +878,6 @@ func TestQueryExecutorPlanPassSelect(t *testing.T) {
 	if err != nil {
 		t.Fatalf("qre.Execute() = %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, field := range got.Fields {
-		field.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("got: %v, want: %v", got, want)
 	}
@@ -955,11 +940,6 @@ func TestQueryExecutorPlanOther(t *testing.T) {
 	if err != nil {
 		t.Fatalf("got: %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, field := range got.Fields {
-		field.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("qre.Execute() = %v, want: %v", got, want)
 	}
@@ -1135,11 +1115,6 @@ func TestQueryExecutorTableAcl(t *testing.T) {
 	if err != nil {
 		t.Fatalf("got: %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, field := range got.Fields {
-		field.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("qre.Execute() = %v, want: %v", got, want)
 	}
@@ -1184,11 +1159,6 @@ func TestQueryExecutorTableAclNoPermission(t *testing.T) {
 	if err != nil {
 		t.Fatalf("got: %v, want nil", err)
 	}
-	// Clear the flags, they interfere with the diff.
-	// FIXME(alainjobart) the new mysqlconn client won't have this issue.
-	for _, f := range got.Fields {
-		f.Flags = 0
-	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("qre.Execute() = %v, want: %v", got, want)
 	}