1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-04 01:42:00 +03:00

5.5 merge

This commit is contained in:
Sergei Golubchik
2014-02-01 00:54:03 +01:00
304 changed files with 12473 additions and 942 deletions

View File

@ -84,11 +84,12 @@ static const char *handler_error_messages[]=
"Index column length exceeds limit",
"Index corrupted",
"Undo record too big",
"Table is being used in foreign key check",
"Invalid InnoDB FTS Doc ID",
"Table is being used in foreign key check",
"Row is not visible by the current transaction",
"Operation was interrupted by end user (probably kill command?)",
"Disk full"
"Disk full",
"Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this"
};
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */