diff options
author | joerg@trift2. <> | 2007-12-21 13:13:22 +0100 |
---|---|---|
committer | joerg@trift2. <> | 2007-12-21 13:13:22 +0100 |
commit | a0fbcc032613e5dd18e876ba629be1cfc9261e9d (patch) | |
tree | 0050ad1d7c3f69c267460f7100da81b366e64b07 /netware | |
parent | 9f96125023be05659ab257a1c6af6fe1dd024932 (diff) | |
parent | bf1ba3d416e3b05a6585c29c8f5050d3dae5ec55 (diff) | |
download | mariadb-git-a0fbcc032613e5dd18e876ba629be1cfc9261e9d.tar.gz |
Merge trift2.:/MySQL/M50/merge-5.0
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'netware')
-rw-r--r-- | netware/mysql_test_run.c | 1 | ||||
-rw-r--r-- | netware/mysqld_safe.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index c32abce20d3..010c4380fdd 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -25,6 +25,7 @@ #include <sys/stat.h> #include <sys/mode.h> #include "my_manage.h" +#include "mysql_version.h" #ifdef __NETWARE__ #define strindex(a,b) ((char*)strindex(a,b)) #define strstr(a,b) ((char*)strstr(a,b)) diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c index 00e7d1bcd51..6ed04c9ff0d 100644 --- a/netware/mysqld_safe.c +++ b/netware/mysqld_safe.c @@ -28,6 +28,7 @@ #include "my_config.h"
#include "my_manage.h"
+#include "mysql_version.h" /******************************************************************************
|