From e627f12dc650438146d0275c9ead21ca351bd796 Mon Sep 17 00:00:00 2001
From: Matthias Hannig <matthias@hannig.cc>
Date: Fri, 24 Jul 2015 12:25:52 +0200
Subject: [PATCH 1/2] Added ID to NewDriver to avoid ExpVar collisions

---
 cluster.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster.go b/cluster.go
index 31b69f5..0095613 100644
--- a/cluster.go
+++ b/cluster.go
@@ -174,8 +174,8 @@ func (d Driver) Open(name string) (driver.Conn, error) {
 }
 
 // NewDriver returns an initialized Cluster driver, using upstreamDriver as backend
-func NewDriver(upstreamDriver driver.Driver) Driver {
-	m := expvar.NewMap("ClusterSql")
+func NewDriver(id string, upstreamDriver driver.Driver) Driver {
+	m := expvar.NewMap(id)
 	Time := new(expvar.String)
 	Time.Set(time.Now().String())
 	m.Set("FirstInstanciated", Time)

From da87e22ab62fc698ed3341ac58f34106eb962af4 Mon Sep 17 00:00:00 2001
From: Matthias Hannig <matthias@hannig.cc>
Date: Fri, 24 Jul 2015 12:35:02 +0200
Subject: [PATCH 2/2] updated test

---
 cluster_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster_test.go b/cluster_test.go
index 2e9bf1c..8c9c8db 100644
--- a/cluster_test.go
+++ b/cluster_test.go
@@ -65,7 +65,7 @@ func TestOpen(t *testing.T) {
 		}
 	}
 
-	d := NewDriver(mysql.MySQLDriver{})
+	d := NewDriver("ClusterSql", mysql.MySQLDriver{})
 
 	for _, ncfg := range cfg.Nodes {
 		if ncfg.Password != "" {