Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

1 files changed, 2 insertions, 4 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index c53847a81d6..6871701e691 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -4140,7 +4140,7 @@ void init_win_path_patterns()
                           "$MYSQL_TMP_DIR",
                           "$MYSQLTEST_VARDIR",
                           "./test/" };
-  int num_paths= sizeof(paths)/sizeof(char*),
+  int num_paths= sizeof(paths)/sizeof(char*);
   int i;
   char* p;
 
@@ -6456,7 +6456,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern,
 {
   my_regex_t r;
   my_regmatch_t *subs;
-  char *buf_end, *replace_end;
+  char *replace_end;
   char *buf= *buf_p;
   int len;
   int buf_len, need_buf_len;
@@ -6476,8 +6476,6 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern,
 
   SECURE_REG_BUF
 
-    buf_end= buf + buf_len;
-
   if (icase)
     cflags|= REG_ICASE;