summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-08 22:19:57 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-08 22:19:57 -0300
commitdbf76b0deb58ef188585b85f93a0add4d8fcc9d8 (patch)
tree238d411e2b08bc69aac8580f7fbbc024078d70ed /client
parenta10ae35328ec800eff63c0bbb06d279e44c0a5a1 (diff)
downloadmariadb-git-dbf76b0deb58ef188585b85f93a0add4d8fcc9d8.tar.gz
Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled
Post-merge fix: cast argument and correct type in assignment.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 1d821c18111..9845a3ec060 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -6338,7 +6338,7 @@ void free_win_path_patterns()
for (i=0 ; i < patterns.elements ; i++)
{
const char** pattern= dynamic_element(&patterns, i, const char**);
- my_free(*pattern);
+ my_free((void *) *pattern);
}
delete_dynamic(&patterns);
}