diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-27 19:31:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-27 19:31:11 +0200 |
| commit | 6339053d9d04161aebbd3d8f9ebcb9d081c10284 (patch) | |
| tree | d1b07dc0628b773032c9602776d3da5f234266e5 /sql/share/german | |
| parent | 48a64b57033b004d6e4fa92e5c13b21f0f24af22 (diff) | |
| parent | e3114057d4f397e0f8c3c8f98a8caf7ce06d8197 (diff) | |
| download | mariadb-git-6339053d9d04161aebbd3d8f9ebcb9d081c10284.tar.gz | |
merging
include/mysql_com.h:
Auto merged
include/mysqld_error.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share/german')
| -rw-r--r-- | sql/share/german/errmsg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index cb449738d61..2eaca078a5b 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -243,7 +243,7 @@ "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 return more than 1 field", +"Cardinality error (more/less than %d columns)", "Subselect return more than 1 record", "Unknown prepared statement handler (%ld) given to %s", "Help database is corrupt or does not exist", |