diff options
author | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-02-04 21:52:14 +0200 |
commit | 023d6dd39b9068ab8096c5ec60ab82bd10dbcee2 (patch) | |
tree | bad5f8dd7f020cc76a4c5e0f19bd130e3fb4a735 /sql/ha_myisammrg.cc | |
parent | 6a32ae735541b4780a209e883430ded343115792 (diff) | |
parent | 5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff) | |
download | mariadb-git-023d6dd39b9068ab8096c5ec60ab82bd10dbcee2.tar.gz |
Merge with 4.0.11
Diffstat (limited to 'sql/ha_myisammrg.cc')
-rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 00052239f0b..5f07bbc4140 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) |