23 files changed, 26 insertions, 26 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index d43a433da06..2ef5dc43180 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -1,4 +1,4 @@
-/*
+v/*
    Modifikoval Petr -B╘najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
 	ISO LATIN-8852-2
    Dal-B╧М verze Jan Pazdziora, adelton@fi.muni.cz-A
@@ -249,7 +249,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 3a947bcbe38..74d8dadaf72 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 1cb81849be1..5c8261fc07d 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -251,7 +251,7 @@
 "Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log",
 "Wrong foreign key definition for '%-.64s': %s",
 "Key reference and table reference doesn't match",
-"Subselect returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 6e96fdb393e..89789669612 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 394c40c5778..f1716831b2a 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -245,7 +245,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index b18d3f8fb38..ab07311aa5e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 49ea31dd05b..028297531fa 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",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index b203c63949b..240a0119f84 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 07081e689ad..63f61a3ca5a 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -242,7 +242,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 0a380e2b48f..569e6d1cacb 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 2e0a083ca06..96eb983cc5d 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -242,7 +242,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 19fcf98e3c7..4f68c071d58 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 810aaf38f74..cda119773d9 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -242,7 +242,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index a74a0a910b8..11f2cffd896 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -242,7 +242,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index efde31ff4c9..63079565d83 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -244,7 +244,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index e90d5844b9b..64eee8c525f 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 18f0bf7f79d..3461df87734 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -244,7 +244,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 790d738031c..06e44722cf5 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/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",
-"Подзапрос возвращает более одного поля",
+"Ошибка мощьности множества (больше/меньше %d колонок)",
 "Подзапрос возвращает более одной записи",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index e8186d38a5b..f7438457660 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -236,7 +236,7 @@
 "User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
 "Wrong foreign key definition for '%-.64s': %s",
 "Key reference and table reference doesn't match",
-"Subselect returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 216d46fcd3a..8db9dd7770b 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -248,7 +248,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 5076b1b6679..19377803257 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -241,7 +241,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index a3bb40fb4f5..e12a30ed422 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -240,7 +240,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 returns more than 1 field",
+"Cardinality error (more/less than %d columns)",
 "Subselect returns more than 1 record",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 426c2a14e3b..a824fd1cdd8 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -245,8 +245,8 @@
 "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",
-"Пiдзапит поверта╓ бiльш нiж 1 стовбець",
-"Пiдзапит поверта╓ бiльш нiж 1 запис",
+"Cardinality error (б╕льше/меньше н╕ж %d стовбц╕в)",
+"П╕дзапит поверта╓ б╕льш нiж 1 запис",
 "Unknown prepared statement handler (%ld) given to %s",
 "Help database is corrupt or does not exist",
-"Циклiчне посилання на пiдзапит",
+"Цикл╕чне посилання на п╕дзапит",