diff options
| author | unknown <mats@romeo.(none)> | 2006-10-06 15:31:05 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2006-10-06 15:31:05 +0200 |
| commit | 5e81d1301e375fc903466df025d1f9f22a3b0994 (patch) | |
| tree | bacce208c70954e5ab55bde5d8e31391840ead28 /sql/share/errmsg.txt | |
| parent | cc4435ad8fb8037f8e6353655d2342ec25fbd207 (diff) | |
| parent | d8be3113351929f12e4277f4306a1428a280d970 (diff) | |
| download | mariadb-git-5e81d1301e375fc903466df025d1f9f22a3b0994.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b19459-mysql-5.1-new
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
mysys/base64.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index a73b3b97f1b..3d3eceb7011 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5968,6 +5968,9 @@ ER_CANT_ACTIVATE_LOG ger "Kann Logdatei '%-.64s' nicht aktivieren" ER_RBR_NOT_AVAILABLE eng "The server was not built with row-based replication" +ER_BASE64_DECODE_ERROR + eng "Decoding of base64 string failed" + swe "Avkodning av base64 sträng misslyckades" ger "Der Server hat keine zeilenbasierte Replikation" ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA eng "Triggers can not be created on system tables" |