Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246

into  shakedown.(none):/home/jpipes/dev/bug20246/my50-bug20246


include/mysql.h:
  Auto merged

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' */