bk commit into 5.1 tree (tomas:1.2031)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2031 06/01/11 19:49:38 tomas@stripped +2 -0
  bug: replication of table spaces to work
  bug: check if storage engine is enabled to avoif code dump

  sql/sql_tablespace.cc
    1.2 06/01/11 19:49:27 tomas@stripped +7 -1
    bug: replication of table spaces to work
    bug: check if storage engine is enabled to avoif code dump

  BitKeeper/etc/ignore
    1.220 06/01/11 19:49:27 tomas@stripped +9 -0
    Added 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 to the ignore list

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.1/sql/sql_tablespace.cc	2006-01-11 11:35:19 +01:00
+++ 1.2/sql/sql_tablespace.cc	2006-01-11 19:49:27 +01:00
@@ -30,7 +30,8 @@
   */
   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)
     {
@@ -45,6 +46,11 @@
       my_error(error, MYF(0));
     }
     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);
 }

--- 1.219/BitKeeper/etc/ignore	2005-12-26 09:15:44 +01:00
+++ 1.220/BitKeeper/etc/ignore	2006-01-11 19:49:27 +01:00
@@ -1661,3 +1661,12 @@
 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