Merge pull request #699 from marekbecka/innodb_stats

author Pierre-Yves Ritschard <pyr@spootnik.org>

Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)

committer Pierre-Yves Ritschard <pyr@spootnik.org>

Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)
author Pierre-Yves Ritschard <pyr@spootnik.org>
Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)
committer Pierre-Yves Ritschard <pyr@spootnik.org>
Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)
diff --cc src/mysql.c
Simple merge
diff --cc src/types.db
Simple merge
author	Pierre-Yves Ritschard <pyr@spootnik.org>
	Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)
committer	Pierre-Yves Ritschard <pyr@spootnik.org>
	Thu, 20 Nov 2014 15:38:57 +0000 (16:38 +0100)
		1	2
src/mysql.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history