diff options
| author | unknown <jimw@rama.(none)> | 2006-07-18 10:25:04 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-07-18 10:25:04 -0700 |
| commit | a00f18e5e6d956d9e69f999720620eeecab45e08 (patch) | |
| tree | 076fd3b798b96ac27bbf09594d537719b6473bbe /sql/ha_myisammrg.cc | |
| parent | abbf7ad01461284d8c92fbc385caa4b37fa50765 (diff) | |
| parent | e52940aa7f4337173d9295eb9e42951713ac96c7 (diff) | |
| download | mariadb-git-a00f18e5e6d956d9e69f999720620eeecab45e08.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-engines
into rama.(none):/home/jimw/my/mysql-5.0-17608
include/my_base.h:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 9780f163634..0b6e05fcbd4 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -132,6 +132,10 @@ int ha_myisammrg::close(void) int ha_myisammrg::write_row(byte * buf) { statistic_increment(table->in_use->status_var.ha_write_count,&LOCK_status); + + if (file->merge_insert_method == MERGE_INSERT_DISABLED || !file->tables) + return (HA_ERR_TABLE_READONLY); + if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT) table->timestamp_field->set_time(); if (table->next_number_field && buf == table->record[0]) |