summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-07-20 16:30:10 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-07-20 16:30:10 -0300
commit6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f (patch)
treec02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /client/mysql.cc
parent8d407c5f704c523205d52eabd89ca7fd366cf6eb (diff)
parentc96b249fc3912f7a86f885cc62da1a3eeed537c6 (diff)
downloadmariadb-git-6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index abf01d8127d..c99886d28d3 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3656,7 +3656,7 @@ xmlencode_print(const char *src, uint length)
tee_fputs("NULL", PAGER);
else
{
- for (const char *p = src; length; *p++, length--)
+ for (const char *p = src; length; p++, length--)
{
const char *t;
if ((t = array_value(xmlmeta, *p)))
@@ -4744,7 +4744,7 @@ static const char* construct_prompt()
struct tm *t = localtime(&lclock);
/* parse thru the settings for the prompt */
- for (char *c = current_prompt; *c ; *c++)
+ for (char *c = current_prompt; *c ; c++)
{
if (*c != PROMPT_CHAR)
processed_prompt.append(*c);