summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2003-09-29 23:10:30 +0400
committerunknown <dlenev@mysql.com>2003-09-29 23:10:30 +0400
commit55dc3dcb82dc13b182c1b44006ec3bde6b83af18 (patch)
tree5b3564d9eb7c88307ede7e8582dfa47c337e3955 /client
parentad0a7a3034c4ea799b26842dc5cd66936b7f5f51 (diff)
downloadmariadb-git-55dc3dcb82dc13b182c1b44006ec3bde6b83af18.tar.gz
Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
client/mysqltest.c: Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution). mysql-test/t/mysqlbinlog.test: Added additional replaces potentially needed after adding reset of replace conditions for exec
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index fcb9bb7102e..fd1c928b4fd 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -866,6 +866,10 @@ int do_exec(struct st_query* q)
while (fgets(buf, sizeof(buf), res_file))
replace_dynstr_append_mem(ds, buf, strlen(buf));
pclose(res_file);
+
+ if (glob_replace)
+ free_replace();
+
if (record)
{
if (!q->record_file[0] && !result_file)