database/sql: move from exp/sql

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5536076

src/pkg/Makefile

@@ -59,6 +59,8 @@ DIRS=\
 	crypto/x509\
 	crypto/x509/pkix\
 	crypto/xtea\
+	database/sql\
+	database/sql/driver\
 	debug/dwarf\
 	debug/macho\
 	debug/elf\
@@ -82,8 +84,6 @@ DIRS=\
 	exp/gotype\
 	exp/norm\
 	exp/spdy\
-	exp/sql\
-	exp/sql/driver\
 	exp/ssh\
 	exp/terminal\
 	exp/types\

src/pkg/database/sql/Makefile

@@ -4,7 +4,7 @@
 
 include ../../../Make.inc
 
-TARG=exp/sql
+TARG=database/sql
 GOFILES=\
 	convert.go\
 	sql.go\

src/pkg/database/sql/convert.go

@@ -7,8 +7,8 @@
 package sql
 
 import (
+	"database/sql/driver"
 	"errors"
-	"exp/sql/driver"
 	"fmt"
 	"reflect"
 	"strconv"

src/pkg/database/sql/convert_test.go

@@ -5,7 +5,7 @@
 package sql
 
 import (
-	"exp/sql/driver"
+	"database/sql/driver"
 	"fmt"
 	"reflect"
 	"testing"

src/pkg/database/sql/driver/Makefile

@@ -4,7 +4,7 @@
 
 include ../../../../Make.inc
 
-TARG=exp/sql/driver
+TARG=database/sql/driver
 GOFILES=\
 	driver.go\
 	types.go\

src/pkg/database/sql/fakedb_test.go

@@ -5,6 +5,7 @@
 package sql
 
 import (
+	"database/sql/driver"
 	"errors"
 	"fmt"
 	"io"
@@ -13,8 +14,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"exp/sql/driver"
 )
 
 var _ = log.Printf

src/pkg/database/sql/sql.go

@@ -7,12 +7,11 @@
 package sql
 
 import (
+	"database/sql/driver"
 	"errors"
 	"fmt"
 	"io"
 	"sync"
-
-	"exp/sql/driver"
 )
 
 var drivers = make(map[string]driver.Driver)