bzr push into mysql-trunk branch (nirbhay.choubey:3509 to 3510) Bug#13102538

[Nirbhay Choubey]

 3510 Nirbhay Choubey	2011-10-18 [merge]
      Merge of fix for bug#13102538 from mysql-5.5.

    modified:
      cmd-line-utils/libedit/np/strlcat.c
      cmd-line-utils/libedit/np/strlcpy.c
      cmd-line-utils/libedit/np/unvis.c
      cmd-line-utils/libedit/np/vis.c
      cmd-line-utils/libedit/np/vis.h
 3509 Jorgen Loland	2011-10-18
      WL#5953: Optimize away useless subquery clauses
      
      Follow-up patch: Show the transformations in optimizer trace

    modified:
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      sql/sql_select.cc
=== modified file 'cmd-line-utils/libedit/np/strlcat.c'
--- a/cmd-line-utils/libedit/np/strlcat.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/np/strlcat.c	2011-10-18 17:17:32 +0000
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #endif /* LIBC_SCCS and not lint */
 

=== modified file 'cmd-line-utils/libedit/np/strlcpy.c'
--- a/cmd-line-utils/libedit/np/strlcpy.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/np/strlcpy.c	2011-10-18 17:17:32 +0000
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #endif /* LIBC_SCCS and not lint */
 

=== modified file 'cmd-line-utils/libedit/np/unvis.c'
--- a/cmd-line-utils/libedit/np/unvis.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/np/unvis.c	2011-10-18 17:17:32 +0000
@@ -31,7 +31,6 @@
 
 #include "config.h"
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";

=== modified file 'cmd-line-utils/libedit/np/vis.c'
--- a/cmd-line-utils/libedit/np/vis.c	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/np/vis.c	2011-10-18 17:17:32 +0000
@@ -57,7 +57,6 @@
 
 #include "config.h"
 
-#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #endif /* LIBC_SCCS and not lint */
 

=== modified file 'cmd-line-utils/libedit/np/vis.h'
--- a/cmd-line-utils/libedit/np/vis.h	2011-10-13 19:33:25 +0000
+++ b/cmd-line-utils/libedit/np/vis.h	2011-10-18 17:17:32 +0000
@@ -76,7 +76,6 @@
  * unvis flags
  */
 #define	UNVIS_END	_VIS_END	/* no more characters */
-#include <sys/cdefs.h>
 /* XXXMYSQL */
 #ifndef __RENAME
 #define __RENAME(x)

No bundle (reason: useless for push emails).