bk commit into 5.0 tree (msvensson:1.2021) BUG#16557

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2021 06/02/13 14:02:39 msvensson@neptunus.(none) +1 -0
  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
    1.10 06/02/13 14:02:35 msvensson@neptunus.(none) +2 -2
    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. 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug16557/my50-bug16557

--- 1.9/cmd-line-utils/libedit/readline.c	2005-05-12 19:01:53 +02:00
+++ 1.10/cmd-line-utils/libedit/readline.c	2006-02-13 14:02:35 +01:00
@@ -1109,7 +1109,7 @@
 
 	if (h == NULL || e == NULL)
 		rl_initialize();
-	return (history(h, &ev, H_LOAD, filename));
+	return (history(h, &ev, H_LOAD, filename) == -1);
 }
 
 
@@ -1123,7 +1123,7 @@
 
 	if (h == NULL || e == NULL)
 		rl_initialize();
-	return (history(h, &ev, H_SAVE, filename));
+	return (history(h, &ev, H_SAVE, filename) == -1);
 }