diff options
author | jpipes@shakedown.(none) <> | 2006-12-07 08:49:53 -0500 |
---|---|---|
committer | jpipes@shakedown.(none) <> | 2006-12-07 08:49:53 -0500 |
commit | 421533e1567143be048db05a006ec32ba053008f (patch) | |
tree | e079cc4ff1c83e8828f720e84a7a568cd1911455 /include/mysql.h | |
parent | 7cb305ca77e0ea93834898c10cd7248a899f0178 (diff) | |
parent | 07ee2594e5ee739a3ee35347bbca7f56556427c8 (diff) | |
download | mariadb-git-421533e1567143be048db05a006ec32ba053008f.tar.gz |
Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
Diffstat (limited to 'include/mysql.h')
-rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index f2a82c99fc3..99d6fc27407 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' */ |