Skip to content

Commit

Permalink
fix some error merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
zbdba committed Sep 1, 2020
1 parent 186e0f2 commit 630120d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sql/share/errmsg-utf8.txt
Expand Up @@ -7961,6 +7961,6 @@ ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS
ER_NOT_ALLOWED_IN_THIS_CONTEXT
eng "'%-.128s' is not allowed in this context"
ER_DATA_WAS_COMMITED_UNDER_ROLLBACK
eng "Engine %s does not support rollback. Changes where committed during rollback call"
eng "Engine %s does not support rollback. Changes where commited during rollback call"
ER_ALTER_TO_MERGE_ENGINE_NOT_SUPPORTED
eng "%s is not supported for this operation, The original table is not merge engine and have rows may cause table data lost."

0 comments on commit 630120d

Please sign in to comment.