bzr push into mysql-trunk branch (roy.lyseng:3969 to 3970)

[Roy Lyseng]

 3970 Roy Lyseng	2012-07-04 [merge]
      (no message)

    modified:
      storage/innobase/fts/fts0opt.cc
 3969 Roy Lyseng	2012-07-04 [merge]
      (no message)

    modified:
      sql/item.h
      sql/opt_sum.cc
      sql/sql_optimizer.cc
      sql/sql_planner.cc
      sql/table.h
=== modified file 'storage/innobase/fts/fts0opt.cc'
--- a/storage/innobase/fts/fts0opt.cc	2012-05-17 01:21:00 +0000
+++ b/storage/innobase/fts/fts0opt.cc	2012-07-04 14:02:23 +0000
@@ -2557,6 +2557,11 @@ fts_optimize_add_table(
 		return;
 	}
 
+	/* Make sure table with FTS index cannot be evicted */
+	if (table->can_be_evicted) {
+		dict_table_move_from_lru_to_non_lru(table);
+	}
+
 	msg = fts_optimize_create_msg(FTS_MSG_ADD_TABLE, table);
 
 	ib_wqueue_add(fts_optimize_wq, msg, msg->heap);

No bundle (reason: useless for push emails).