bzr push into mysql-trunk branch (nirbhay.choubey:3245 to 3246) WL#5945

[Nirbhay Choubey]

 3246 Nirbhay Choubey	2011-10-03
      WL#5945 : Improve libedit library
      
      * Number of bytes in a multibyte character can
        be (at most) equal to MB_CUR_MAX.
      * Fix for a compiler warning.

    modified:
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/readline.c
 3245 Nirbhay Choubey	2011-10-03
      WL#5945 : Improve libedit library
        
      Sync with NetBSD CVS head.

    modified:
      cmd-line-utils/libedit/README
      cmd-line-utils/libedit/chared.c
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/el.c
      cmd-line-utils/libedit/el.h
      cmd-line-utils/libedit/el_terminal.h
      cmd-line-utils/libedit/eln.c
      cmd-line-utils/libedit/emacs.c
      cmd-line-utils/libedit/filecomplete.c
      cmd-line-utils/libedit/hist.c
      cmd-line-utils/libedit/history.c
      cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/map.c
      cmd-line-utils/libedit/parse.c
      cmd-line-utils/libedit/prompt.c
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/search.c
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/terminal.c
      cmd-line-utils/libedit/tty.c
      cmd-line-utils/libedit/tty.h
      cmd-line-utils/libedit/vi.c
      mysql-test/mysql-test-run.pl
=== modified file 'cmd-line-utils/libedit/read.c'
--- a/cmd-line-utils/libedit/read.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/read.c	2011-10-03 15:44:13 +0000
@@ -333,7 +333,7 @@ memset(&state, 0, sizeof(mbstate_t));
 
 #ifdef WIDECHAR
         ++cbp;
-        if (cbp >= MB_CUR_MAX) { /* "shouldn't happen" */
+        if (cbp > MB_CUR_MAX) { /* "shouldn't happen" */
           *cp = '\0';
           return (-1);
         }

=== modified file 'cmd-line-utils/libedit/readline.c'
--- a/cmd-line-utils/libedit/readline.c	2011-10-03 14:45:01 +0000
+++ b/cmd-line-utils/libedit/readline.c	2011-10-03 15:44:13 +0000
@@ -1312,8 +1312,10 @@ history_truncate_file (const char *filen
 		}
 	}
 	fflush(fp);
-	if((off = ftello(fp)) > 0)
-		(void)ftruncate(fileno(fp), off);
+	if((off = ftello(fp)) > 0) {
+		if (ftruncate(fileno(fp), off) == -1)
+                  ret = errno;
+        }
 out3:
 	fclose(tp);
 out2:

No bundle (reason: useless for push emails).