merge

Docs/manual.texi:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

2 files changed, 6 insertions, 11 deletions

diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index d1cf24caf48..d9f9f05ae97 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -11,7 +11,7 @@ DEFS = 		-DEMBEDDED_LIBRARY
 INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) \
 		-I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client
 LIBS =		@LIBS@
-LDADD =		../libmysqld.a @innodb_system_libs@ @LIBDL@
+LDADD =		../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
 mysqltest_SOURCES =	mysqltest.c
 
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c
index a6723f8322e..9bf492ed5ea 100644
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@@ -146,27 +146,23 @@ int vio_write(Vio * vio, const gptr buf, int size)
 
 int vio_blocking(Vio * vio, my_bool set_blocking_mode)
 {
-  int r=0;
-  return (r);
+  return (0);
 }
 
 my_bool
 vio_is_blocking(Vio * vio)
 {
-  my_bool r=0;
-  return(r);
+  return(0);
 }
 
 int vio_fastsend(Vio * vio)
 {
-  int r=0;
-  return(r);
+  return(0);
 }
 
 int vio_keepalive(Vio* vio, my_bool set_keep_alive)
 {
-  int r=0;
-  return (r);
+  return (0);
 }
 
 
@@ -181,8 +177,7 @@ vio_should_retry(Vio * vio __attribute__((unused)))
 
 int vio_close(Vio * vio)
 {
-  int r=0;
-  return(r);
+  return(0);
 }