Commit 33d25a80 authored by unknown's avatar unknown
Browse files

Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
parents 48b8edc2 9a0b8eb1

cmd-line-utils/readline/display.c

+12 −0
Original line number Diff line number Diff line
@@ -524,6 +524,17 @@ rl_redisplay () 
      wrap_offset = prompt_invis_chars_first_line = 0;

    }



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \

	  { \

	    inv_lbsize *= 2; \

	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#else

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \
@@ -532,6 +543,7 @@ rl_redisplay () 
	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#endif



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_LPOS() \