diff options
| author | Sven Sandberg <sven.sandberg@sun.com> | 2009-08-19 13:38:30 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@sun.com> | 2009-08-19 13:38:30 +0200 |
| commit | bfb1de9c065b6e9fd6b9fecb1c2db2b4475d3135 (patch) | |
| tree | a32ec4f15fa4dc27cd8b0aca8fc4bd785d22ff84 /sql/share/errmsg.txt | |
| parent | fa32b4f29618a43cd989e997bb4ff3079ffe914a (diff) | |
| download | mariadb-git-bfb1de9c065b6e9fd6b9fecb1c2db2b4475d3135.tar.gz | |
post-push fixes for BUG#39934
Removed hard-coded error messages. All messages are now in
errmsg.txt
Also renamed enumeration value BINLOG_STMT_UNSAFE_FUNCTION to
BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION to make the naming consistent
with BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE.
sql/item_create.cc:
Renamed BINLOG_STMT_UNSAFE_FUNCTION to
BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION
sql/share/errmsg.txt:
Moved hard-coded strings from THD::issue_unsafe_warnings() to
errmsg.txt.
sql/sql_class.cc:
- Moved error messages to errmsg.txt.
- Updated comment above THD::issue_unsafe_warnings().
sql/sql_lex.h:
Renamed BINLOG_STMT_UNSAFE_FUNCTION to
BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION
sql/sql_yacc.yy:
Renamed BINLOG_STMT_UNSAFE_FUNCTION to
BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 1f466dd3db6..1dbab075614 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6215,3 +6215,23 @@ ER_BINLOG_ROW_INJECTION_AND_STMT_MODE eng "Cannot execute row injection: binlogging impossible since BINLOG_FORMAT = STATEMENT." ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE eng "Cannot execute statement: binlogging impossible since more than one engine is involved and at least one engine is self-logging." + +ER_BINLOG_UNSAFE_LIMIT + eng "Statement uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted." +ER_BINLOG_UNSAFE_INSERT_DELAYED + eng "Statement uses INSERT DELAYED. This is unsafe because the time when rows are inserted cannot be predicted." +ER_BINLOG_UNSAFE_SYSTEM_TABLE + eng "Statement uses the general_log or slow_log table. This is unsafe because system tables may differ on slave." +ER_BINLOG_UNSAFE_TWO_AUTOINC_COLUMNS + eng "Statement updates two AUTO_INCREMENT columns. This is unsafe because the generated value cannot be predicted by slave." +ER_BINLOG_UNSAFE_UDF + eng "Statement uses a UDF. It cannot be determined if the UDF will return the same value on slave." +ER_BINLOG_UNSAFE_SYSTEM_VARIABLE + eng "Statement uses a system variable whose value may differ on slave." +ER_BINLOG_UNSAFE_SYSTEM_FUNCTION + eng "Statement uses a system function whose value may differ on slave." + +ER_BINLOG_UNSAFE_WARNING_SHORT + eng "%s Reason: %s" +ER_BINLOG_UNSAFE_WARNING_LONG + eng "%s Reason: %s Statement: %s" |