diff options
author | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-10-14 11:36:48 +0000 |
commit | 65c4fdc00797b16a56f00d5b0b36b54265868b6f (patch) | |
tree | 50e53348aa9b2bb4539eb9061d6dbaf5b3bb646f /sql/share/swedish/errmsg.txt | |
parent | 228bfb05e31363775fac59fdc9ef8e2041183f08 (diff) | |
parent | db85094bc5386b58ff0b5fa93adab05b12eb9e16 (diff) | |
download | mariadb-git-65c4fdc00797b16a56f00d5b0b36b54265868b6f.tar.gz |
merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'sql/share/swedish/errmsg.txt')
-rw-r--r-- | sql/share/swedish/errmsg.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index 1a352f16225..874b9c2882a 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -197,7 +197,7 @@ "Okänd system variabel '%-.64s'", "Tabell '%-.64s' är crashad och bör repareras med REPAIR TABLE", "Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades", -"Warning: Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK", +"Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK", "Transaktionen krävde mera än 'max_binlog_cache_size' minne. Utöka denna mysqld variabel och försök på nytt", "Denna operation kan inte göras under replikering; Gör SLAVE STOP först", "Denna operation kan endast göras under replikering; Konfigurera slaven och gör SLAVE START", @@ -238,3 +238,7 @@ "Wrong usage/placement of '%s'", "This version of MySQL doesn't yet support '%s'", "Got fatal error %d: '%-.128s' from master when reading data from binary log", +"Wrong foreign key definition for '%-.64s': %s", +"Key reference and table reference doesn't match", +"Subselect returns more than 1 field", +"Subselect returns more than 1 record", |