diff options
author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-07-22 23:43:59 +0300 |
---|---|---|
committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-07-22 23:43:59 +0300 |
commit | a2701c78b409779b724f3ff85d348ab5fd14a5e3 (patch) | |
tree | 02552074434f0ff47a06118e8d54f309fe6a2cad /sql/ha_myisammrg.cc | |
parent | 1128e41af8ff0cfaf124d031ad5f077114147922 (diff) | |
download | mariadb-git-a2701c78b409779b724f3ff85d348ab5fd14a5e3.tar.gz |
Faster alter table code for 5.1.
mysql-test/r/alter_table.result:
Added some additional tests for new alter table code.
mysql-test/t/alter_table.test:
Added some additional tests for new alter table code.
sql/field.cc:
Functions to check whether new field is equal with old field.
Classes for different types.
sql/field.h:
Functions to check whether new field is equal with old field.
Classes for different types.
sql/ha_berkeley.cc:
check_if_incompatible_data() for BDB.
sql/ha_berkeley.h:
check_if_incompatible_data() for BDB.
sql/ha_heap.cc:
check_if_incompatible_data() for HEAP.
sql/ha_heap.h:
check_if_incompatible_data() for HEAP.
sql/ha_innodb.cc:
check_if_incompatible_data() for InnoDB.
sql/ha_innodb.h:
check_if_incompatible_data() for InnoBD.
sql/ha_myisam.cc:
check_if_incompatible_data() for MyISAM.
sql/ha_myisam.h:
check_if_incompatible_data() for MyISAM.
sql/ha_myisammrg.cc:
check_if_incompatible_data() for Merge tables.
sql/ha_myisammrg.h:
check_if_incompatible_data() for Merge tables.
sql/ha_ndbcluster.cc:
check_if_incompatible_data() for NDB.
sql/ha_ndbcluster.h:
check_if_incompatible_data() for NDB.
sql/handler.h:
Defines for COMPATIBLE_DATA (yes and no) and the default function
for check_if_incompatible_data().
sql/mysql_priv.h:
Defines for IS_EQUAL_*
sql/mysqld.cc:
Added option --old-alter-table to disable new alter table code.
sql/set_var.cc:
Added option --old-alter-table to disable new alter table code.
sql/set_var.h:
Added option --old-alter-table to disable new alter table code.
sql/sql_class.h:
Added option --old-alter-table to disable new alter table code.
sql/sql_lex.h:
Added a flag for forcing recreation of a table
(needed for optimize table mapped to alter table)
sql/sql_table.cc:
Made a function of setting table default charset, used
now in two places.
Added defines for ALTER_TABLE_* possible changes.
Currently just overall data and index.
Added function compare_tables, which checks fields
compatibility in old and new tables.
BitKeeper/etc/config:
Disabled logging
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r-- | sql/ha_myisammrg.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 794f1c62dd7..f56edc09dc6 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -488,3 +488,14 @@ void ha_myisammrg::append_create_info(String *packet) } packet->append(')'); } + + +bool ha_myisammrg::check_if_incompatible_data(HA_CREATE_INFO *info, + uint table_changes) +{ + /* + For myisammrg, we should always re-generate the mapping file as this + is trivial to do + */ + return COMPATIBLE_DATA_NO; +} |