Bug#2809 - conf.h should be included before mysql.h in mod_sql_mysql.c.  The
mod_sql_postgres module was similarly updated.


Index: contrib/mod_sql_mysql.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_mysql.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -p -r1.42 -r1.43
--- contrib/mod_sql_mysql.c	16 Jun 2006 02:22:05 -0000	1.42
+++ contrib/mod_sql_mysql.c	28 Jun 2006 16:32:47 -0000	1.43
@@ -132,10 +132,11 @@
 
 #define _MYSQL_PORT "3306"
 
-#include <mysql.h>
 #include "conf.h"
 #include "../contrib/mod_sql.h"
 
+#include <mysql.h>
+
 /* 
  * timer-handling code adds the need for a couple of forward declarations
  */
Index: contrib/mod_sql_postgres.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql_postgres.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -p -r1.29 -r1.30
--- contrib/mod_sql_postgres.c	16 Jun 2006 02:22:05 -0000	1.29
+++ contrib/mod_sql_postgres.c	28 Jun 2006 16:32:47 -0000	1.30
@@ -38,10 +38,11 @@
 
 #define _POSTGRES_PORT "5432"
 
-#include <libpq-fe.h>
 #include "conf.h"
 #include "../contrib/mod_sql.h"
 
+#include <libpq-fe.h>
+
 /* 
  * timer-handling code adds the need for a couple of forward declarations
  */