summaryrefslogtreecommitdiff
path: root/cmd-line-utils/readline/histexpand.c
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-12-16 11:13:58 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-12-16 11:13:58 +0100
commit33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (patch)
tree83c2beab0fb52424ab77dcb1449a3f394f0d0fe1 /cmd-line-utils/readline/histexpand.c
parentdec388d5beac2e9d0d32ce1610b871c3d1042544 (diff)
parentcf175bf4b8fef9c054fa4779fbea011ad43432a0 (diff)
downloadmariadb-git-33827e7dbfc177ef52718f63eaf87e005ab3e8b5.tar.gz
Merge from mysql-5.5.8-release
Diffstat (limited to 'cmd-line-utils/readline/histexpand.c')
-rw-r--r--cmd-line-utils/readline/histexpand.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/histexpand.c b/cmd-line-utils/readline/histexpand.c
index ab8d8ecc866..7b51c369827 100644
--- a/cmd-line-utils/readline/histexpand.c
+++ b/cmd-line-utils/readline/histexpand.c
@@ -693,7 +693,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
case 's':
{
char *new_event;
- int delimiter, failed, si, l_temp, ws, we;
+ int delimiter, failed, si, l_temp, we;
if (c == 's')
{
@@ -792,7 +792,6 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
{
for (; temp[si] && whitespace (temp[si]); si++)
;
- ws = si;
we = history_tokenize_word (temp, si);
}