bzr push into mysql-trunk branch (nirbhay.choubey:3521 to 3522) Bug#13106585

[Nirbhay Choubey]

 3522 Nirbhay Choubey	2011-10-21 [merge]
      Merge of fix for bug#13106585 from mysql-5.5.

    modified:
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/histedit.h
      cmd-line-utils/libedit/refresh.c
      cmd-line-utils/libedit/sys.h
      cmd-line-utils/libedit/terminal.c
 3521 Olav Sandstaa	2011-10-21
      Fix for Bug#13242509 - COMPILE ERROR WHEN COMPILING WITHOUT OPTIMIZER TRACE
      
      The compilation failed due to the member function add(const char*, ulong) was
      missing from the "empty" implementation of Opt_trace_object that is used when
      compiling without support for optimizer traces. The fix is to add the function
      to the empty Opt_trace_object.
     @ sql/opt_trace.h
        Add the member function add(const char *key, ulong value) to the
        empty implementation of the Opt_trace_object that is used when
        compiling without support for optimizer traces. This function already
        exists for the real implemention of Opt_trace_object.

    modified:
      sql/opt_trace.h
=== modified file 'cmd-line-utils/libedit/CMakeLists.txt'
--- a/cmd-line-utils/libedit/CMakeLists.txt	2011-10-13 19:47:46 +0000
+++ b/cmd-line-utils/libedit/CMakeLists.txt	2011-10-21 12:44:35 +0000
@@ -156,6 +156,7 @@ ${CURSES_INCLUDE_PATH}
 
 SET(LIBEDIT_SOURCES
   chared.c 
+  chartype.c
   el.c 
   eln.c 
   history.c

=== modified file 'cmd-line-utils/libedit/chartype.c'
--- a/cmd-line-utils/libedit/chartype.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/chartype.c	2011-10-21 12:40:12 +0000
@@ -258,9 +258,6 @@ out:
 	return NULL;
 }
 
-#ifdef WIDECHAR
-int wcwidth(wchar_t wc);                        // Signature.
-#endif
 
 protected int
 ct_visual_width(Char c)

=== modified file 'cmd-line-utils/libedit/histedit.h'
--- a/cmd-line-utils/libedit/histedit.h	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/histedit.h	2011-10-21 12:40:12 +0000
@@ -247,15 +247,6 @@ int		 tok_str(Tokenizer *, const char *,
 /*
  * Begin Wide Character Support
  */
-#ifdef __linux__
-/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
-#include <wchar.h>
-#include <wctype.h>
 
 /*
  * Wide character versions

=== modified file 'cmd-line-utils/libedit/refresh.c'
--- a/cmd-line-utils/libedit/refresh.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/refresh.c	2011-10-21 12:40:12 +0000
@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)refresh.c	8.
 #endif
 #endif /* not lint && not SCCSID */
 
-#include "chartype.c"                           /* XXXMYSQL  */
-
 /*
  * refresh.c: Lower level screen refreshing functions
  */

=== modified file 'cmd-line-utils/libedit/sys.h'
--- a/cmd-line-utils/libedit/sys.h	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/sys.h	2011-10-21 12:40:12 +0000
@@ -92,8 +92,21 @@ size_t	strlcpy(char *dst, const char *sr
 char	*fgetln(FILE *fp, size_t *len);
 #endif
 
-#ifndef HAVE_WCSDUP
+#ifdef __linux__
+/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#endif
+
+#ifndef __USE_XOPEN
+#define __USE_XOPEN
+#endif
+
 #include <wchar.h>
+#include <wctype.h>
+
+#ifndef HAVE_WCSDUP
 wchar_t *wcsdup(const wchar_t *);
 #endif
 

=== modified file 'cmd-line-utils/libedit/terminal.c'
--- a/cmd-line-utils/libedit/terminal.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/terminal.c	2011-10-21 12:40:12 +0000
@@ -636,9 +636,6 @@ mc_again:
 	el->el_cursor.h = where;		/* now where is here */
 }
 
-#ifdef WIDECHAR
-int wcwidth(wchar_t);                           // Signature.
-#endif
 
 /* terminal_overwrite():
  *	Overstrike num characters

No bundle (reason: useless for push emails).