summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-07-21 23:55:32 +0200
committerunknown <serg@sergbook.mysql.com>2002-07-21 23:55:32 +0200
commit4eff0593d6f501075ab97bbc43b7076dfb636cb3 (patch)
tree18b81d0250f43e62349dfb3c0cb2dde8af33f444 /sql/ha_myisammrg.cc
parent13b326f105eb6904aaa69115e244e52a7f71615b (diff)
downloadmariadb-git-4eff0593d6f501075ab97bbc43b7076dfb636cb3.tar.gz
AUTO_INCREMENT support for MERGE
HA_AUTO_PART_KEY support for handler parent class Docs/manual.texi: AUTO_INCREMENT support for MERGE mysql-test/r/merge.result: AUTO_INCREMENT support for MERGE sql/ha_myisammrg.cc: AUTO_INCREMENT support for MERGE sql/ha_myisammrg.h: AUTO_INCREMENT support for MERGE sql/handler.cc: default handler::update_auto_increment now supports HA_AUTO_PART_KEY
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 4e09c87f341..a04aafec130 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -75,8 +75,7 @@ int ha_myisammrg::write_row(byte * buf)
if (table->time_stamp)
update_timestamp(buf+table->time_stamp-1);
if (table->next_number_field && buf == table->record[0])
- return (my_errno=HA_ERR_WRONG_COMMAND);
- // update_auto_increment(); - [phi] have to check this before allowing it
+ update_auto_increment();
return myrg_write(file,buf);
}