Merge with 4.0

innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/fut/fut0lst.c:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/fsp0fsp.h:
  Auto merged
innobase/include/ha0ha.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/mem0pool.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/rem0rec.h:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0sys.h:
  Auto merged
innobase/include/ut0byte.h:
  Auto merged
innobase/include/ut0ut.h:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0uins.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
innobase/ut/ut0byte.c:
  Auto merged
pstack/bucomm.h:
  Auto merged
pstack/budbg.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/insert_test.c:
  Auto merged
mysql-test/t/func_group.test:
  Merge with 4.0
  Put 4.1 tests lasts
sql/ha_innodb.cc:
  Merge with 4.0
  Added checking of results from my_malloc()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 22 insertions, 3 deletions

diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 1d4bfee86a4..f6092921a02 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -221,6 +221,12 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
     r=_mi_search(info, ftbw->keyinfo, (uchar*) ftbw->word+ftbw->off,
                    USE_WHOLE_KEY, SEARCH_BIGGER, ftbw->key_root);
   }
+
+  /* Skip rows inserted by concurrent insert */
+  while (!r && info->lastpos >= info->state->data_file_length)
+    r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
+		       SEARCH_BIGGER, keyroot);
+
   if (!r && !ftbw->off)
   {
     r= mi_compare_text(ftb->charset,
@@ -267,8 +273,10 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
     subkeys=ft_sintXkorr(info->lastkey+off);
     if (subkeys<0)
     {
-      /* yep, going down, to the second-level tree */
-      /* TODO here: subkey-based optimization */
+      /*
+	yep, going down, to the second-level tree
+	TODO here: subkey-based optimization
+      */
       ftbw->off=off;
       ftbw->key_root=info->lastpos;
       ftbw->keyinfo=& info->s->ft2_keyinfo;
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c
index 03875abe7b0..b79bf8a2baa 100644
--- a/myisam/ft_nlq_search.c
+++ b/myisam/ft_nlq_search.c
@@ -88,7 +88,13 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
   keylen-=HA_FT_WLEN;
   doc_cnt=0;
 
-  r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root);
+  /* Skip rows inserted by current inserted */
+  for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root)
+         !r && info->lastpos >= info->state->data_file_length;
+       r= _mi_search_next(info, keyinfo, info->lastkey,
+                          info->lastkey_length, SEARCH_BIGGER, key_root))
+    ;
+
   info->update|= HA_STATE_AKTIV;              /* for _mi_test_if_changed() */
 
   while (!r && gweight)
@@ -151,6 +157,11 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
     else
 	r=_mi_search(info, keyinfo, info->lastkey, info->lastkey_length,
                      SEARCH_BIGGER, key_root);
+
+    while (!r && info->lastpos >= info->state->data_file_length)
+      r= _mi_search(info, keyinfo, info->lastkey, info->lastkey_length,
+                    SEARCH_BIGGER, key_root);
+
   }
   word->weight=gweight;