summaryrefslogtreecommitdiff
path: root/storage/ibmdb2i
diff options
context:
space:
mode:
Diffstat (limited to 'storage/ibmdb2i')
-rw-r--r--storage/ibmdb2i/db2i_constraints.cc4
-rw-r--r--storage/ibmdb2i/ha_ibmdb2i.cc7
2 files changed, 9 insertions, 2 deletions
diff --git a/storage/ibmdb2i/db2i_constraints.cc b/storage/ibmdb2i/db2i_constraints.cc
index 3afa12032d0..5b9d3600393 100644
--- a/storage/ibmdb2i/db2i_constraints.cc
+++ b/storage/ibmdb2i/db2i_constraints.cc
@@ -494,10 +494,10 @@ int ha_ibmdb2i::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_lis
convFromEbcdic(FKCstDef->CstName.Name, convName,FKCstDef->CstName.Len);
if (convName[0] == '"') // If quoted, exclude quotes.
- f_key_info.forein_id = thd_make_lex_string(thd, 0,
+ f_key_info.foreign_id = thd_make_lex_string(thd, 0,
convName + 1, (uint) (FKCstDef->CstName.Len - 2), 1);
else // Not quoted
- f_key_info.forein_id = thd_make_lex_string(thd, 0,
+ f_key_info.foreign_id = thd_make_lex_string(thd, 0,
convName, (uint) FKCstDef->CstName.Len, 1);
/* Process the names of the foreign keys. */
diff --git a/storage/ibmdb2i/ha_ibmdb2i.cc b/storage/ibmdb2i/ha_ibmdb2i.cc
index 947df8ad2fe..e5eccad1573 100644
--- a/storage/ibmdb2i/ha_ibmdb2i.cc
+++ b/storage/ibmdb2i/ha_ibmdb2i.cc
@@ -1806,6 +1806,13 @@ int ha_ibmdb2i::delete_all_rows()
}
+int ha_ibmdb2i::truncate()
+{
+ int error = delete_all_rows();
+ return error ? error : reset_auto_increment(0);
+}
+
+
int ha_ibmdb2i::external_lock(THD *thd, int lock_type)
{
int rc = 0;