summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-12-16 19:31:19 +0200
committerGeorgi Kodinov <joro@sun.com>2009-12-16 19:31:19 +0200
commitadc17cd41e21cb68d63b9962a97ad075da02999f (patch)
tree3ced378450a6cc83a82e27f10b1d7183ae48f151 /client
parent1f55f5b617d0df650161c58f7d0707abd4ca42e2 (diff)
downloadmariadb-git-adc17cd41e21cb68d63b9962a97ad075da02999f.tar.gz
Bug #48866: mysql.test fails under Fedora 12
strmov() is not guaranteed to work correctly on overlapping source and destination buffers. On some OSes it may work, but Fedora 12 has a stpcpy() that's not working correctly on overlapping buffers. Fixed to use the overlap-safe version of strmov instead. Re-vitalized the overlap-safe version of strmov.
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index e4eabe8de33..5ae58baa694 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4108,7 +4108,7 @@ char *get_arg(char *line, my_bool get_next_arg)
if (*ptr == '\\' && ptr[1]) // escaped character
{
// Remove the backslash
- strmov(ptr, ptr+1);
+ strmov_overlapp(ptr, ptr+1);
}
else if ((!quoted && *ptr == ' ') || (quoted && *ptr == qtype))
{