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 /myisammrg | |
parent | 6a32ae735541b4780a209e883430ded343115792 (diff) | |
parent | 5ce0cd16b8b9fa05c781ac6ff4687133ed145d84 (diff) | |
download | mariadb-git-023d6dd39b9068ab8096c5ec60ab82bd10dbcee2.tar.gz |
Merge with 4.0.11
Diffstat (limited to 'myisammrg')
-rw-r--r-- | myisammrg/myrg_open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index f996277d287..7ff00270c68 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -84,7 +84,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) last_isam=isam; if (info.reclength && info.reclength != isam->s->base.reclength) { - my_errno=HA_ERR_WRONG_IN_RECORD; + my_errno=HA_ERR_WRONG_MRG_TABLE_DEF; goto err; } info.reclength=isam->s->base.reclength; |