diff options
| author | unknown <lars@black.(none)> | 2006-10-10 21:59:23 +0200 |
|---|---|---|
| committer | unknown <lars@black.(none)> | 2006-10-10 21:59:23 +0200 |
| commit | c34940a0786f472ab3d1797c6cd97228b1ee49f5 (patch) | |
| tree | 8540e483e880421e97e84bf91c84cd2320023353 /sql/share | |
| parent | ef0ee7642ad986551495bd891ad78bcdb11c7fcf (diff) | |
| parent | 3f3ffdccc1200e82b7d788d897afa5086452ee17 (diff) | |
| download | mariadb-git-c34940a0786f472ab3d1797c6cd97228b1ee49f5.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
include/my_sys.h:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
Diffstat (limited to 'sql/share')
| -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 a34e8c152cf..0bcd15c2b82 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" |