merge with 3.23.48

BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge

1 files changed, 52 insertions, 1 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 031e9d57205..d075e17ee56 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -48720,6 +48720,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.49::                Changes in release 3.23.49
 * News-3.23.48::                Changes in release 3.23.48
 * News-3.23.47::                Changes in release 3.23.47
 * News-3.23.46::                Changes in release 3.23.46
@@ -48772,14 +48773,64 @@ not yet 100% confident in this code.
 * News-3.23.0::                 Changes in release 3.23.0
 @end menu
 
-@node News-3.23.48, News-3.23.47, News-3.23.x, News-3.23.x
+@node News-3.23.49, News-3.23.48, News-3.23.x, News-3.23.x
+@appendixsubsec Changes in release 3.23.49
+@itemize @bullet
+@item
+Fixed unlikely caching bug when doing a join without keys. In this case
+the last used field for a table always returned @code{NULL}.
+@end itemize
+
+@node News-3.23.48, News-3.23.47, News-3.23.49, News-3.23.x
 @appendixsubsec Changes in release 3.23.48
 @itemize @bullet
 @item
+Changed to use @code{autoconf} 2.52 (from @code{autoconf} 2.13)
+@item
 Fixed bug in complicated join with @code{const} tables.
 @item
 Added internal safety checks for InnoDB.
 @item
+Some InnoDB variables was always shown in @code{SHOW VARIABLES} as
+@code{OFF} on high-byte-first systems (like sparc).
+@item
+Fixed problem with one thread using an InnoDB table and another
+thread doing an @code{ALTER TABLE} on the same table. Before that,
+mysqld could crash with an assertion failure in row0row.c, line 474.
+@item
+Tuned the InnoDB SQL optimizer to favor more often index searches
+over table scans.
+@item
+Fixed a performance problem with InnoDB tables when several large SELECT
+queries are run concurrently on a multiprocessor Linux computer.  Large
+CPU-bound SELECT queries will now also generally run faster on all
+platforms.
+@item
+If MySQL binlogging is used, InnoDB now prints after crash recovery the
+latest MySQL binlog name and the offset InnoDB was able to recover
+to. This is useful, for example, when resynchronizing a master and a
+slave database in replication.
+@item
+Added better error messages to help in installation problems of InnoDB tables.
+@item
+One can now recover also MySQL temporary tables which have become
+orphaned inside the InnoDB tablespace.
+@item
+InnoDB now prevents a @code{FOREIGN KEY} declaration where the signedness
+is not the same in the referencing and referenced integer columns.
+@item
+Calling @code{SHOW CREATE TABLE} or @code{SHOW TABLE STATUS} could cause
+memory corruption and make mysqld to crash.  Especially at risk was
+@code{mysqldump}, because it calls frequently @code{SHOW CREATE TABLE}.
+@item
+If inserts to several tables containing an auto-inc column were wrapped
+inside one @code{LOCK TABLES}, InnoDB asserted in lock0lock.c.
+@item
+In 3.23.47 we allowed several @code{NULLS} in a @code{UNIQUE} secondary
+index for an InnoDB table.  But @code{CHECK TABLE} was not relaxed: it
+reports the table as corrupt.  @code{CHECK TABLE} no longer complains in
+this situation.
+@item
 @code{SHOW GRANTS} now shows @code{REFERENCES} instead of @code{REFERENCE}.
 @end itemize