diff options
author | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-11-25 02:27:02 +0200 |
commit | a352372170815bebd65755bc5fff00fdf964cf9b (patch) | |
tree | 64b87aad2e52257f0c6cb4d27336e0d1fb516494 /sql/ha_myisammrg.h | |
parent | f88d01932f4a81682267e21022686d3dea4edb78 (diff) | |
parent | 00899088a5f576721ecbf3ca235cdfcd691c8a0e (diff) | |
download | mariadb-git-a352372170815bebd65755bc5fff00fdf964cf9b.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.h')
-rw-r--r-- | sql/ha_myisammrg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index 264c580220c..6058c32c805 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -32,6 +32,7 @@ class ha_myisammrg: public handler ~ha_myisammrg() {} const char *table_type() const { return "MRG_MyISAM"; } const char **bas_ext() const; + const char *index_type(uint key_number); ulong table_flags() const { return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME | |