diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2009-02-26 15:01:57 +0100 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2009-02-26 15:01:57 +0100 |
| commit | a7fe00afb5442800f54e50636c7ee829c8194d60 (patch) | |
| tree | 97e626bcafe04b22529c41fb424fdc61eff525eb /sql/share | |
| parent | e6babb70a6eae54f82d86adac582ba99e3475ea6 (diff) | |
| download | mariadb-git-a7fe00afb5442800f54e50636c7ee829c8194d60.tar.gz | |
Bug#43215 6 error codes changed from 5.1 to 6.0
sql/share/errmsg.txt:
- Reserve released error codes in 5.1
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 5dc75c340ea..23231eefcc2 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6154,3 +6154,18 @@ WARN_PLUGIN_BUSY ER_VARIABLE_IS_READONLY eng "%s variable '%s' is read-only. Use SET %s to assign the value" + +ER_WARN_ENGINE_TRANSACTION_ROLLBACK + eng "Storage engine %s does not support rollback for this statement. Transaction rolled back and must be restarted" + +ER_SLAVE_HEARTBEAT_FAILURE + eng "Unexpected master's heartbeat data: %s" +ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE + eng "The requested value for the heartbeat period %s %s" + +ER_NDB_REPLICATION_SCHEMA_ERROR + eng "Bad schema for mysql.ndb_replication table. Message: %-.64s" +ER_CONFLICT_FN_PARSE_ERROR + eng "Error in parsing conflict function. Message: %-.64s" +ER_EXCEPTIONS_WRITE_ERROR + eng "Write to exceptions table failed. Message: %-.128s"" |