merge with 3.23.47

Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/handler.h:
  Auto merged
configure.in:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join_outer.result:
  merge
mysql-test/r/myisam.result:
  merge
mysql-test/t/innodb.test:
  merge
mysys/mf_iocache2.c:
  Skip changes in 3.23
sql/sql_select.cc:
  merge

1 files changed, 14 insertions, 1 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 485665e0c84..9e906c000f0 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -46442,6 +46442,7 @@ users use this code as the rest of the code and because of this we are
 not yet 100% confident in this code.
 
 @menu
+* News-3.23.47::                Changes in release 3.23.47
 * News-3.23.46::                Changes in release 3.23.46
 * News-3.23.45::                Changes in release 3.23.45
 * News-3.23.44::                Changes in release 3.23.44
@@ -46492,10 +46493,22 @@ not yet 100% confident in this code.
 * News-3.23.0::                 Changes in release 3.23.0
 @end menu
 
-@node News-3.23.46, News-3.23.45, News-3.23.x, News-3.23.x
+@node News-3.23.47, News-3.23.46, News-3.23.x, News-3.23.x
+@appendixsubsec Changes in release 3.23.47
+@itemize @bullet
+@item
+Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}.
+@item
+@code{mysqlconfig} now also work with binary (relocated) distributions.
+@end itemize
+
+@node News-3.23.46, News-3.23.45, News-3.23.47, News-3.23.x
 @appendixsubsec Changes in release 3.23.46
 @itemize @bullet
 @item
+InnoDB and BDB tables will now use index when doing an @code{ORDER BY}
+on the whole table.
+@item
 Fixed bug where one got an empty set instead of a DEADLOCK error when using
 BDB tables.
 @item