diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-20 12:40:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-20 12:40:21 +0300 |
| commit | fca241584f7c80adbc420955dd569db05f37c5bb (patch) | |
| tree | 1d3c315024c2557bae5d03386853272310ae55ed /sql/share | |
| parent | c42767e52ebd6b61556dde6ba43a90a8e46c241e (diff) | |
| parent | f027e4e00f0c4ecef89b635ae2ab1e48eb076bff (diff) | |
| download | mariadb-git-fca241584f7c80adbc420955dd569db05f37c5bb.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 50bd40325a0..1eb8ae9dd82 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6309,6 +6309,8 @@ ER_WRONG_NATIVE_TABLE_STRUCTURE ER_WRONG_PERFSCHEMA_USAGE eng "Invalid performance_schema usage." +ER_WARN_I_S_SKIPPED_TABLE + eng "Table '%s'.'%s' was skipped since its definition is being modified by concurrent DDL statement" ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT eng "Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction" |