Commit b39626f9 authored by unknown's avatar unknown

Bug#16557 mysql cmd-line client does not rename .mysql_history.TMP to .mysql_history

 - Return error only if 'history' returns -1


cmd-line-utils/libedit/readline.c:
  Return 1 to indicate error only if 'history' returned -1, since the history function normally will return the number of entries written or read. Only -1 indicates error.
parent 101e618f
...@@ -1109,7 +1109,7 @@ read_history(const char *filename) ...@@ -1109,7 +1109,7 @@ read_history(const char *filename)
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
return (history(h, &ev, H_LOAD, filename)); return (history(h, &ev, H_LOAD, filename) == -1);
} }
...@@ -1123,7 +1123,7 @@ write_history(const char *filename) ...@@ -1123,7 +1123,7 @@ write_history(const char *filename)
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
return (history(h, &ev, H_SAVE, filename)); return (history(h, &ev, H_SAVE, filename) == -1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment