diff options
| author | unknown <joerg@trift2.> | 2007-12-21 13:13:22 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-12-21 13:13:22 +0100 |
| commit | c8f6457f650845ab1f9e04b2136b8351e4d465aa (patch) | |
| tree | 0050ad1d7c3f69c267460f7100da81b366e64b07 /netware | |
| parent | df4e7698e7d25a96ab80de9950bf5d2606278234 (diff) | |
| parent | c7eb461d549480cccb2ed9b1830bd03d8edda36e (diff) | |
| download | mariadb-git-c8f6457f650845ab1f9e04b2136b8351e4d465aa.tar.gz | |
Merge trift2.:/MySQL/M50/merge-5.0
into trift2.:/MySQL/M51/push-5.1
netware/mysql_test_run.c:
Auto merged
sql/sp_head.cc:
Auto merged
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" /******************************************************************************
|