Merge remote-tracking branch 'upstream/master'

author Zebity Spring <zebity@yahoo.com>

Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)

committer Zebity Spring <zebity@yahoo.com>

Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)
author Zebity Spring <zebity@yahoo.com>
Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)
committer Zebity Spring <zebity@yahoo.com>
Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)
diff --cc src/mysql.c
Simple merge
diff --cc src/write_riemann.c
Simple merge
author	Zebity Spring <zebity@yahoo.com>
	Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)
committer	Zebity Spring <zebity@yahoo.com>
	Mon, 3 Jun 2019 06:45:04 +0000 (16:45 +1000)
		1	2
src/mysql.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_riemann.c	patch \|	diff1 \|	diff2 \|	blob \| history