Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

.bzrignore

@@ -1661,3 +1661,12 @@ zlib/*.vcproj
 client/mysqlslap
 storage/archive/archive_test
 item_xmlfunc.cc
+storage/ndb/test/ndbapi/DbAsyncGenerator
+storage/ndb/test/ndbapi/DbCreate
+storage/ndb/test/ndbapi/ndbapi_slow_select
+storage/ndb/test/ndbapi/testBitfield
+storage/ndb/test/ndbapi/testLcp
+storage/ndb/test/ndbapi/testPartitioning
+storage/ndb/test/ndbapi/testReadPerf
+storage/ndb/test/ndbapi/test_event_merge
+storage/ndb/test/tools/listen_event

sql/sql_tablespace.cc

@@ -30,7 +30,8 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
   */
   hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine);
 
-  if (hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))
+  if (hton->state == SHOW_OPTION_YES &&
+      hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))
   {
     if (error == HA_ADMIN_NOT_IMPLEMENTED)
     {
@@ -46,5 +47,10 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
     }
     DBUG_RETURN(error);
   }
+  if (mysql_bin_log.is_open())
+  {
+    thd->binlog_query(THD::STMT_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, TRUE);
+  }
   DBUG_RETURN(FALSE);
 }