From 9e48e73f9a8727a1e81a8da12b7634ee47b5779a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Dec 2006 19:13:00 -0500 Subject: [PATCH] Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h) MYSQL_VERSION_ID is tested before it has been defined. This leads to a warning when compiling with -Wundef and it also will break the internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds 50000. The fix entailed a simple re-ordering of included files in mysql.h include/mysql.h: Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h) MYSQL_VERSION_ID is tested before it has been defined. This leads to a warning when compiling with -Wundef and it also will break the internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds 50000. Placed the #include for mysql_version.h above mysql_com.h to resolve conflict --- include/mysql.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mysql.h b/include/mysql.h index 55ef6ee6d10..d0b8f57903d 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -65,9 +65,9 @@ typedef int my_socket; #endif /* my_socket_defined */ #endif /* _global_h */ +#include "mysql_version.h" #include "mysql_com.h" #include "mysql_time.h" -#include "mysql_version.h" #include "typelib.h" #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */