summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-09 00:17:22 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-09 00:17:22 +0100
commit0100c53f9deeaab395b39d25f643489a44559920 (patch)
treedc88a614281994a6f1366b1ceb5c8aafbe72601b
parentb3e24bedd3389779a368f57738317c516114efee (diff)
downloadmariadb-git-0100c53f9deeaab395b39d25f643489a44559920.tar.gz
Fix warnings and NetWare compile failure
client/mysql_upgrade.c: Fix NetWare problem - illegal cast of "const char*" to "char*" Fix warning, init "mystat" in FILEINFO to NULL Fix warning, remove unused variable "i"
-rw-r--r--client/mysql_upgrade.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index e5855aee605..b8344606448 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -378,7 +378,7 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l
{
int ret;
va_list va;
- FILEINFO key= { name };
+ FILEINFO key= { (char*)name, NULL };
const char *subdir;
char *cp;
@@ -395,7 +395,6 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l
{
MY_DIR *dir;
FILEINFO *match;
- uint i;
char *cp1;
cp1= strnmov(cp + 1, subdir, len - (cp - result) - 1);