summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-01-04 15:40:55 +0200
committerunknown <monty@mashka.mysql.fi>2003-01-04 15:40:55 +0200
commit8ce6c9fc6c3091c43ab91980fe904ed5125ba597 (patch)
tree49da2620373e1b4c73d505405819d5d7097786bc /sql/ha_myisammrg.cc
parentf67891c24422a223a50a2477883e587c520057ad (diff)
parente229fe9801cc9fb7e3783cf708bc7cb695606c64 (diff)
downloadmariadb-git-8ce6c9fc6c3091c43ab91980fe904ed5125ba597.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/t/multi_update.test: Auto merged mysys/Makefile.am: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 4398aaecf4d..3bd812821f6 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -239,6 +239,13 @@ void ha_myisammrg::info(uint flag)
#else
ref_length=4; // Can't be > than my_off_t
#endif
+ if (flag & HA_STATUS_CONST)
+ {
+ if (table->key_parts)
+ memcpy((char*) table->key_info[0].rec_per_key,
+ (char*) info.rec_per_key,
+ sizeof(table->key_info[0].rec_per_key)*table->key_parts);
+ }
}
@@ -257,9 +264,7 @@ int ha_myisammrg::extra(enum ha_extra_function operation)
int ha_myisammrg::extra_opt(enum ha_extra_function operation, ulong cache_size)
{
- if ((specialflag & SPECIAL_SAFE_MODE) &
- (operation == HA_EXTRA_WRITE_CACHE ||
- operation == HA_EXTRA_BULK_INSERT_BEGIN))
+ if ((specialflag & SPECIAL_SAFE_MODE) && operation == HA_EXTRA_WRITE_CACHE)
return 0;
return myrg_extra(file, operation, (void*) &cache_size);
}