--- sql/mysql/ChangeLog	2013/10/30 15:53:54	1.17
+++ sql/mysql/ChangeLog	2015/11/03 12:29:07	1.19
@@ -1,3 +1,15 @@
+2015-10-26  moko
+
+	* Makefile.am, config_auto.h.in: warning war: configure.in ->
+	  configure.ac, INCLUDES -> AM_CPPFLAGS
+
+	* config_fixed.h, config_includes.h, parser3mysql.C: Copyright year
+	  updated
+
+2015-07-28  moko
+
+	* parser3mysql.C: SET CHARACTER SET -> SET_NAMES (closes bug #985)
+
 2013-07-07  moko
 
 	* aclocal.m4, Makefile.am, config_auto.h.in, configure,