diff options
| author | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
| commit | aa0074e8fc69657148aa214a85acd6342812906e (patch) | |
| tree | bce40fe371fa0025ed0a77a664f62de77cdd04bf /sql/share/danish/errmsg.txt | |
| parent | aa3692429c4d8253fec399b88c156be585d43c71 (diff) | |
| parent | 663b8e3c07200562ef9cefd81a93af80dc26e888 (diff) | |
| download | mariadb-git-aa0074e8fc69657148aa214a85acd6342812906e.tar.gz | |
Merge....
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
libmysql/password.c:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'sql/share/danish/errmsg.txt')
| -rw-r--r-- | sql/share/danish/errmsg.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 5638260277e..65eb190b48b 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -182,7 +182,7 @@ "Du bruger sikker opdaterings modus ('safe update mode') og du forsøgte at opdatere en tabel uden en WHERE klausul, der gør brug af et KEY felt", "Nøglen '%-.64s' eksisterer ikke i tabellen '%-.64s'", "Kan ikke åbne tabellen", -"Denne tabeltype understøtter ikke CHECK/REPAIR", +"Denne tabeltype understøtter ikke %s", "Du må ikke bruge denne kommando i en transaktion", "Modtog fejl %d mens kommandoen COMMIT blev udført", "Modtog fejl %d mens kommandoen ROLLBACK blev udført", @@ -246,4 +246,6 @@ "Subselect returns more than 1 field", "Subselect returns more than 1 record", "Unknown prepared statement handler (%ld) given to %s", -"Help database is corrupt or does not exist",
\ No newline at end of file +"Help database is corrupt or does not exist", +"Cyclic reference on subqueries", +"Converting column '%s' from %s to %s" |