diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-01-11 19:49:38 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-01-11 19:49:38 +0100 |
| commit | 45a4daa43fc40115f0144fdbf27bbcb74310b095 (patch) | |
| tree | a7b6e04c7594e35bbff040cc076c012cadb7ebe8 | |
| parent | e44150128e82ae3fa022273ac91c251f7c39091b (diff) | |
| download | mariadb-git-45a4daa43fc40115f0144fdbf27bbcb74310b095.tar.gz | |
bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump
BitKeeper/etc/ignore:
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
| -rw-r--r-- | .bzrignore | 9 | ||||
| -rw-r--r-- | sql/sql_tablespace.cc | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 4a2a3d98101..0b1ec285d88 100644 --- a/.bzrignore +++ b/.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 diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc index 0c99180365e..954d65ea44e 100644 --- a/sql/sql_tablespace.cc +++ b/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); } |