summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-11-30 03:40:42 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-11-30 03:40:42 +0200
commit3a35c30027ed27bf6d2f457168fab2e4ef9e198e (patch)
tree7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /extra
parent717284b85cfdaeacb0e28177e13cf6fd24f36a3b (diff)
downloadmariadb-git-3a35c30027ed27bf6d2f457168fab2e4ef9e198e.tar.gz
Fixed compiler warnings (Mostly VC++):
- Removed not used variables - Changed some ulong parameters/variables to ulonglong (possible serious bug) - Added casts to get rid of safe assignment from longlong to long (and similar) - Added casts to function parameters - Fixed signed/unsigned compares - Added some constructores to structures - Removed some not portable constructs Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" (Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
Diffstat (limited to 'extra')
-rw-r--r--extra/replace.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/replace.c b/extra/replace.c
index 9acf1620d49..418196cf63b 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -1052,8 +1052,10 @@ static int convert_file(REPLACE *rep, my_string name)
{
int error;
FILE *in,*out;
- char dir_buff[FN_REFLEN], tempname[FN_REFLEN];
- char link_name[FN_REFLEN], *org_name = name;
+ char dir_buff[FN_REFLEN], tempname[FN_REFLEN],*org_name = name;
+#ifdef HAVE_READLINK
+ char link_name[FN_REFLEN];
+#endif
File temp_file;
DBUG_ENTER("convert_file");