diff options
| author | heikki@hundin.mysql.fi <> | 2002-12-05 22:03:24 +0200 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-12-05 22:03:24 +0200 |
| commit | 5c3c4d3721fbc2630e9d70c4a9e35246855eef8a (patch) | |
| tree | f45e33c419fff3114e499f1a661e8e737301a675 /sql | |
| parent | 7b58a93a997c247ccdac24d491dee965ad13477d (diff) | |
| download | mariadb-git-5c3c4d3721fbc2630e9d70c4a9e35246855eef8a.tar.gz | |
row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:
Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innobase.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 2f79f8d6ba9..489c2fafd9b 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -233,10 +233,14 @@ convert_error_code_to_mysql( return(HA_ERR_ROW_IS_REFERENCED); - } else if (error == (int) DB_CANNOT_ADD_CONSTRAINT) { + } else if (error == (int) DB_CANNOT_ADD_CONSTRAINT) { return(HA_ERR_CANNOT_ADD_FOREIGN); + } else if (error == (int) DB_COL_APPEARS_TWICE_IN_INDEX) { + + return(HA_ERR_WRONG_TABLE_DEF); + } else if (error == (int) DB_OUT_OF_FILE_SPACE) { return(HA_ERR_RECORD_FILE_FULL); |