diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-12-07 08:49:53 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-12-07 08:49:53 -0500 |
| commit | dae79371d897ea2b9e120d2c0000bd5f5ba95e50 (patch) | |
| tree | e079cc4ff1c83e8828f720e84a7a568cd1911455 /include/mysql.h | |
| parent | 8ef1be3de88a7111c740778d2df853d9d1f164c2 (diff) | |
| parent | 9e48e73f9a8727a1e81a8da12b7634ee47b5779a (diff) | |
| download | mariadb-git-dae79371d897ea2b9e120d2c0000bd5f5ba95e50.tar.gz | |
Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
include/mysql.h:
Auto merged
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' */ |