Automatic merge

Added some minor changes that was done in my tree while waiting for test to run:
- Remove in Maria T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads
- Disable code that is only relevant for EXTERNAL_LOCKING

include/m_string.h:
  Automatic merge
storage/maria/ha_maria.cc:
  Remove T_QUICK when retrying repair for enabling indexes, as the record file may be in use by other threads
storage/maria/ma_check.c:
  Automatic merge
storage/maria/ma_key.c:
  Automatic merge
storage/maria/ma_loghandler.c:
  Automatic merge
storage/maria/ma_open.c:
  Disable code that is only relevant for EXTERNAL_LOCKING
storage/maria/ma_sp_key.c:
  Automatic merge
storage/maria/ma_write.c:
  Automatic merge
storage/maria/trnman.c:
  Automatic merge

1 files changed, 17 insertions, 9 deletions

diff --git a/KNOWN_BUGS.txt b/KNOWN_BUGS.txt
index 3fd1a22d129..980dd5f0da9 100644
--- a/KNOWN_BUGS.txt
+++ b/KNOWN_BUGS.txt
@@ -27,9 +27,10 @@ Known bugs that we are working on and will be fixed shortly
 - We have some instabilities in log writing that is under investigatation
   This causes mainly assert to triggers in the code and sometimes
   the log handler doesn't start up after restart.
+  Most of this should now be fixed...
 
-Known bugs that are planned to be fixed before Beta
-===================================================
+Known bugs that are planned to be fixed before Gamma/RC
+=======================================================
 
 - If we get a write failure on disk (disk full or disk error) for the
   log, we should stop all usage of transactional tables and mark all
@@ -44,15 +45,22 @@ Known bugs that are planned to be fixed before Beta
   or kill mysqld, remove logs and repair tables.
 
 
-Missing features that is planned to fix before Beta
-===================================================
+Known bugs that are planned to be fixed later
+=============================================
+
+LOCK TABLES .. WRITE CONCURRENT is mainly done for testing MVCC.  Don't
+use this in production.  Things that is not working if you are using
+this on a table:
 
-- Multiple concurrent inserts & multiple concurrent readers at same time
-  with full MVCC control.  Note that UPDATE and DELETE will still be
-  blocking (as with MyISAM)
-- COUNT(*) and TABLE CHECKSUM under MVCC (ie, they are instant and kept up
-  to date even with multiple inserter)
+- INSERT/REPLACE ... SELECT on an empty table may cause crashes or
+  wrong results if someone else is doing writes on the table during repair
+  or someone is doing selects during the repair index phase.
 
+INSERT ... SELECT and REPLACE ... SELECT are blocking inserts and 
+SELECT for the table.
+
+Missing features that is planned to fix before Beta
+===================================================
 
 Features planned for future releases
 ====================================