summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.cc
diff options
context:
space:
mode:
authoracurtis/antony@xiphis.org/ltantony.xiphis.org <>2006-08-30 13:20:39 -0700
committeracurtis/antony@xiphis.org/ltantony.xiphis.org <>2006-08-30 13:20:39 -0700
commit678e15174eacc04306c09175781e68a462fcc4f7 (patch)
tree8420b990a80a44f9a16ab6d77359c0a179d2893a /sql/ha_myisammrg.cc
parent6509ad6e8ab2839344b99610f77dbe1d666eb3db (diff)
downloadmariadb-git-678e15174eacc04306c09175781e68a462fcc4f7.tar.gz
Bug#20573
"strict mode: inserts autogenerated auto_increment value bigger than max" Strict mode should fail if autoincrement value is out of range
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r--sql/ha_myisammrg.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 0b6e05fcbd4..cb11d9b0452 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -139,7 +139,11 @@ int ha_myisammrg::write_row(byte * buf)
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
if (table->next_number_field && buf == table->record[0])
- update_auto_increment();
+ {
+ int error;
+ if ((error= update_auto_increment()))
+ return error;
+ }
return myrg_write(file,buf);
}