diff --git a/docker/blocks/mysql/fig b/docker/blocks/mysql/fig
index eb13cac31c8..731d0fbbdc5 100644
--- a/docker/blocks/mysql/fig
+++ b/docker/blocks/mysql/fig
@@ -7,3 +7,6 @@ mysql:
     MYSQL_PASSWORD: password
   ports:
     - "3306:3306"
+  volumes:
+    - /etc/localtime:/etc/localtime:ro
+    - /etc/timezone:/etc/timezone:ro
diff --git a/pkg/services/sqlstore/sql_test_data.go b/pkg/services/sqlstore/sql_test_data.go
index 30399c4bdfc..a83ab76ecc0 100644
--- a/pkg/services/sqlstore/sql_test_data.go
+++ b/pkg/services/sqlstore/sql_test_data.go
@@ -58,6 +58,13 @@ func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
 		sqlog.Info("SQL TestData: Truncate done", "rows", rows)
 
 		sqlRandomWalk("server1", "frontend", 100, 1.123, sess)
+		sqlRandomWalk("server2", "frontend", 100, 1.123, sess)
+		sqlRandomWalk("server3", "frontend", 100, 1.123, sess)
+
+		sqlRandomWalk("server1", "backend", 100, 1.123, sess)
+		sqlRandomWalk("server2", "backend", 100, 1.123, sess)
+		sqlRandomWalk("server3", "backend", 100, 1.123, sess)
+		sqlRandomWalk("db-server1", "backend", 100, 1.123, sess)
 
 		return err
 	})
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index 62624515ca5..be59079c65c 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -93,20 +93,15 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
 
 		rows, err := db.Query(rawSql)
 		if err != nil {
-			result.Error = err
-			return result
+			result.QueryResults[query.RefId] = &tsdb.QueryResult{Error: err}
+			continue
 		}
+
 		defer rows.Close()
 
 		result.QueryResults[query.RefId] = e.TransformToTimeSeries(query, rows)
 	}
 
-	for _, value := range result.QueryResults {
-		if value.Error != nil {
-			e.log.Error("error", "error", value.Error)
-		}
-	}
-
 	return result
 }
 
@@ -190,7 +185,6 @@ func (s *stringStringScan) Update(rows *sql.Rows) error {
 	for i := 0; i < s.columnCount; i++ {
 		if rb, ok := s.rowPtrs[i].(*sql.RawBytes); ok {
 			s.rowValues[i] = string(*rb)
-			fmt.Printf("column %s = %s", s.columnNames[i], s.rowValues[i])
 
 			switch s.columnNames[i] {
 			case "time_sec":
@@ -202,9 +196,7 @@ func (s *stringStringScan) Update(rows *sql.Rows) error {
 					s.value = null.FloatFrom(value)
 				}
 			case "metric":
-				if value, err := strconv.ParseFloat(s.rowValues[i], 64); err == nil {
-					s.value = null.FloatFrom(value)
-				}
+				s.metric = s.rowValues[i]
 			}
 
 			*rb = nil // reset pointer to discard current value to avoid a bug
diff --git a/public/app/plugins/datasource/mysql/partials/query.editor.html b/public/app/plugins/datasource/mysql/partials/query.editor.html
index 1a22bec1e75..932fbc64516 100644
--- a/public/app/plugins/datasource/mysql/partials/query.editor.html
+++ b/public/app/plugins/datasource/mysql/partials/query.editor.html
@@ -1,7 +1,7 @@
 <query-editor-row query-ctrl="ctrl" can-collapse="false">
   <div class="gf-form-inline">
 		<div class="gf-form gf-form--grow">
-			<textarea rows="6" class="gf-form-input" ng-model="ctrl.target.rawSql" spellcheck="false" placeholder="query expression" data-min-length=0 data-items=100 ng-model-onblur ng-change="ctrl.refreshMetricData()"></textarea>
+			<textarea rows="6" class="gf-form-input" ng-model="ctrl.target.rawSql" spellcheck="false" placeholder="query expression" data-min-length=0 data-items=100 ng-model-onblur ng-change="ctrl.panelCtrl.refresh()"></textarea>
 		</div>
 	</div>
 
diff --git a/public/app/plugins/datasource/mysql/plugin.json b/public/app/plugins/datasource/mysql/plugin.json
index 662cde1c3e4..5f35b3f709f 100644
--- a/public/app/plugins/datasource/mysql/plugin.json
+++ b/public/app/plugins/datasource/mysql/plugin.json
@@ -14,6 +14,7 @@
     }
   },
 
+  "alerting": true,
   "annotations": true,
   "metrics": true
 }