summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-21 16:42:07 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-21 16:42:07 +0100
commit92930c122f33abba70f169189a0b7623ac340007 (patch)
tree1bb86fb9b350d80766bf6361e91f533d2ad40bb8 /client
parentfba971f585f22079dae2dbd3044047de8f122b36 (diff)
parenta599cea10a09a420b82f6877eb7ef5c5732b157e (diff)
downloadmariadb-git-92930c122f33abba70f169189a0b7623ac340007.tar.gz
Merge 192.168.0.4:mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 241e0dc4738..c303493c7f5 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -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;