diff options
| author | ingo/mydev@chilla.local <> | 2006-07-10 20:46:05 +0200 |
|---|---|---|
| committer | ingo/mydev@chilla.local <> | 2006-07-10 20:46:05 +0200 |
| commit | dfaa3c78f62d63314992363019fcc1c48c509616 (patch) | |
| tree | 0cbc54a15d93da3ad99331c970b464e151d7564e /sql | |
| parent | be5f48268c5dc03b7b506d2dbf603c75c691adc5 (diff) | |
| download | mariadb-git-dfaa3c78f62d63314992363019fcc1c48c509616.tar.gz | |
Revoking patch for Bug#10952 on behalf of Brian.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_blackhole.cc | 2 | ||||
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 | ||||
| -rw-r--r-- | sql/handler.h | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc index 7632ed59949..2505919af39 100644 --- a/sql/ha_blackhole.cc +++ b/sql/ha_blackhole.cc @@ -47,7 +47,7 @@ handlerton blackhole_hton= { NULL, /* create_cursor_read_view */ NULL, /* set_cursor_read_view */ NULL, /* close_cursor_read_view */ - HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE + HTON_CAN_RECREATE }; /***************************************************************************** diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index d2fd1a9e28a..9780f163634 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -55,7 +55,7 @@ handlerton myisammrg_hton= { NULL, /* create_cursor_read_view */ NULL, /* set_cursor_read_view */ NULL, /* close_cursor_read_view */ - HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE + HTON_CAN_RECREATE }; diff --git a/sql/handler.h b/sql/handler.h index aada647e071..d444ac055c4 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -410,7 +410,6 @@ struct show_table_alias_st { #define HTON_ALTER_NOT_SUPPORTED (1 << 1) //Engine does not support alter #define HTON_CAN_RECREATE (1 << 2) //Delete all is used fro truncate #define HTON_HIDDEN (1 << 3) //Engine does not appear in lists -#define HTON_ALTER_CANNOT_CREATE (1 << 4) //Cannot use alter to create typedef struct st_thd_trans { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 91c71193df2..a4ac7392cf2 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3240,9 +3240,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, DBUG_PRINT("info", ("old type: %d new type: %d", old_db_type, new_db_type)); if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) || - ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED) || - (old_db_type != new_db_type && - ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE))) + ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED)) { DBUG_PRINT("info", ("doesn't support alter")); my_error(ER_ILLEGAL_HA, MYF(0), table_name); |