diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | sql/ha_isam.cc | 2 | ||||
| -rw-r--r-- | sql/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index a25aedaa89f..58a6faa7ef8 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -231,7 +231,7 @@ convert_error_code_to_mysql( } else if (error == (int) DB_COL_APPEARS_TWICE_IN_INDEX) { - return(HA_ERR_WRONG_TABLE_DEF); + return(HA_ERR_CRASHED); } else if (error == (int) DB_OUT_OF_FILE_SPACE) { diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc index 6fa54d18aac..7371628890f 100644 --- a/sql/ha_isam.cc +++ b/sql/ha_isam.cc @@ -35,7 +35,7 @@ *****************************************************************************/ const char **ha_isam::bas_ext() const -{ static const char *ext[]= { ".ISD",".ISM", NullS }; return ext; } +{ static const char *ext[]= { ".ISM",".ISD", NullS }; return ext; } int ha_isam::open(const char *name, int mode, uint test_if_locked) diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 19e97c60dd3..81b04cf5ba7 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -117,7 +117,7 @@ void mi_check_print_warning(MI_CHECK *param, const char *fmt,...) } const char **ha_myisam::bas_ext() const -{ static const char *ext[]= { ".MYD",".MYI", NullS }; return ext; } +{ static const char *ext[]= { ".MYI",".MYD", NullS }; return ext; } const char *ha_myisam::index_type(uint key_number) diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index a93d2e5ed43..616248b2cf3 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -69,7 +69,7 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) err: myrg_close(file); file=0; - return (my_errno= HA_ERR_WRONG_TABLE_DEF); + return (my_errno= HA_ERR_WRONG_MRG_TABLE_DEF); } int ha_myisammrg::close(void) diff --git a/sql/handler.cc b/sql/handler.cc index d4fd45613d4..fb33888e91e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -679,7 +679,7 @@ void handler::print_error(int error, myf errflag) case HA_ERR_END_OF_FILE: textno=ER_KEY_NOT_FOUND; break; - case HA_ERR_WRONG_TABLE_DEF: + case HA_ERR_WRONG_MRG_TABLE_DEF: textno=ER_WRONG_MRG_TABLE; break; case HA_ERR_FOUND_DUPP_KEY: |