diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-09-02 13:22:47 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-09-02 13:22:47 +0300 |
| commit | 8f5b17f5291088ac9e011859351971c1bfe9210a (patch) | |
| tree | ad2bd258297864f123c9991b895df5d1f0d69295 | |
| parent | f7fa5d5a02611a2d604af0dd3584238503d27fbb (diff) | |
| download | mariadb-git-8f5b17f5291088ac9e011859351971c1bfe9210a.tar.gz | |
Fixed win32 compilation warnings
| -rw-r--r-- | mysys/my_redel.c | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_redel.c b/mysys/my_redel.c index c03d1bc7c25..6521253f949 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.c @@ -76,7 +76,9 @@ end: int my_copystat(const char *from, const char *to, int MyFlags) { struct stat statbuf; +#if !defined(__WIN__) && !defined(__NETWARE__) int res; +#endif if (stat((char*) from, &statbuf)) { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9f88fa93c06..4ec104aedc3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -117,7 +117,7 @@ static char* add_identifier(char *to_p, const char * end_p, *(to_p++)= '`'; *(to_p++)= *(conv_name++); } - else if (length < (end_p - to_p)) + else if (((long) length) < (end_p - to_p)) { to_p= strnmov(to_p, conv_name, length); conv_name+= length; |