From 85ee66efb9bdf3ff1ac732fb92c83f57f68f427a Mon Sep 17 00:00:00 2001
From: Pierre Fersing <pierre.fersing@bleemeo.com>
Date: Fri, 29 Apr 2016 18:43:14 +0200
Subject: [PATCH] "DELAYED" Inserts were deprecated in MySQL 5.6.6

closes #1136
---
 CHANGELOG.md                   | 1 +
 plugins/inputs/mysql/README.md | 1 -
 plugins/inputs/mysql/mysql.go  | 8 --------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f05121d06..aae65b99a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,7 @@ based on _prefix_ in addition to globs. This means that a filter like
 - [#1090](https://github.com/influxdata/telegraf/issues/1090): [agent] and [global_tags] config sometimes not getting applied.
 - [#1133](https://github.com/influxdata/telegraf/issues/1133): Use a timeout for docker list & stat cmds.
 - [#1052](https://github.com/influxdata/telegraf/issues/1052): Docker panic fix when decode fails.
+- [#1136](https://github.com/influxdata/telegraf/pull/1136): "DELAYED" Inserts were deprecated in MySQL 5.6.6. Thanks @PierreF
 
 ## v0.12.1 [2016-04-14]
 
diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index b4af1de80..d6f16b398 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -117,7 +117,6 @@ The unit of fields varies by the tags.
     * write_normal(float, number/milliseconds)
     * write_allow_write(float, number/milliseconds)
     * write_concurrent_insert(float, number/milliseconds)
-    * write_delayed(float, number/milliseconds)
     * write_low_priority(float, number/milliseconds)
     * read(float, number/milliseconds)
     * write(float, number/milliseconds)
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index a7254e250..bbc716405 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -454,7 +454,6 @@ const (
             COUNT_READ_EXTERNAL,
             COUNT_WRITE_ALLOW_WRITE,
             COUNT_WRITE_CONCURRENT_INSERT,
-            COUNT_WRITE_DELAYED,
             COUNT_WRITE_LOW_PRIORITY,
             COUNT_WRITE_NORMAL,
             COUNT_WRITE_EXTERNAL,
@@ -465,7 +464,6 @@ const (
             SUM_TIMER_READ_EXTERNAL,
             SUM_TIMER_WRITE_ALLOW_WRITE,
             SUM_TIMER_WRITE_CONCURRENT_INSERT,
-            SUM_TIMER_WRITE_DELAYED,
             SUM_TIMER_WRITE_LOW_PRIORITY,
             SUM_TIMER_WRITE_NORMAL,
             SUM_TIMER_WRITE_EXTERNAL
@@ -1126,7 +1124,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 		countReadExternal          float64
 		countWriteAllowWrite       float64
 		countWriteConcurrentInsert float64
-		countWriteDelayed          float64
 		countWriteLowPriority      float64
 		countWriteNormal           float64
 		countWriteExternal         float64
@@ -1137,7 +1134,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 		timeReadExternal           float64
 		timeWriteAllowWrite        float64
 		timeWriteConcurrentInsert  float64
-		timeWriteDelayed           float64
 		timeWriteLowPriority       float64
 		timeWriteNormal            float64
 		timeWriteExternal          float64
@@ -1154,7 +1150,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 			&countReadExternal,
 			&countWriteAllowWrite,
 			&countWriteConcurrentInsert,
-			&countWriteDelayed,
 			&countWriteLowPriority,
 			&countWriteNormal,
 			&countWriteExternal,
@@ -1165,7 +1160,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 			&timeReadExternal,
 			&timeWriteAllowWrite,
 			&timeWriteConcurrentInsert,
-			&timeWriteDelayed,
 			&timeWriteLowPriority,
 			&timeWriteNormal,
 			&timeWriteExternal,
@@ -1190,7 +1184,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 			"write_normal":            countWriteNormal,
 			"write_allow_write":       countWriteAllowWrite,
 			"write_concurrent_insert": countWriteConcurrentInsert,
-			"write_delayed":           countWriteDelayed,
 			"write_low_priority":      countWriteLowPriority,
 		}
 		acc.AddFields("mysql_perf_schema", sqlLWFields, sqlLWTags)
@@ -1213,7 +1206,6 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.A
 			"write_normal":            timeWriteNormal / picoSeconds,
 			"write_allow_write":       timeWriteAllowWrite / picoSeconds,
 			"write_concurrent_insert": timeWriteConcurrentInsert / picoSeconds,
-			"write_delayed":           timeWriteDelayed / picoSeconds,
 			"write_low_priority":      timeWriteLowPriority / picoSeconds,
 		}
 		acc.AddFields("mysql_perf_schema", sqlLWSecTotalFields, sqlLWSecTotalTags)