diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
| commit | e793dfe95e70c60af4a517ba7a5255ad15d48d95 (patch) | |
| tree | a3fbfddbae0d5a6e600e68942bb243fadb5269aa /mysys | |
| parent | 77f5c5a7cf4e99fa3d760f1541bafec3b182def3 (diff) | |
| parent | 300b3fb64280ae3d982745b683029a2722b3daef (diff) | |
| download | mariadb-git-e793dfe95e70c60af4a517ba7a5255ad15d48d95.tar.gz | |
Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 2 | ||||
| -rw-r--r-- | mysys/my_netware.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index e18467b1235..ec7cae46d53 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -349,7 +349,7 @@ static my_bool win32_init_tcp_ip() static void netware_init() { - char cwd[PATH_MAX], *name + char cwd[PATH_MAX], *name; /* init only if we are not a client library */ if (my_progname) diff --git a/mysys/my_netware.c b/mysys/my_netware.c index 6c3242594df..e41dbd0a029 100644 --- a/mysys/my_netware.c +++ b/mysys/my_netware.c @@ -20,6 +20,7 @@ #include <mysys_priv.h> #ifdef __NETWARE__ + #include <string.h> #include <library.h> /* @@ -61,8 +62,8 @@ long PMMeteredUsageRequest long *NLSMeterErrCode ); -ypedef long(*PMUR)(char*, long, char*, char, char*, long, long*, long*, - long*); +typedef long(*PMUR)(const char*, long, const char*, char, + const char*, long, long*, long*, long*); /* infoType */ /* indicates that the info in the userInfo param is an NDS user */ |