database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with 4.0.11

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-02-04 21:52:14 +02:00
parent 6a32ae7355 5ce0cd16b8
commit 023d6dd39b
206 changed files with 11563 additions and 65011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@@ -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: