21 files changed, 21 insertions, 1 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 39c9fb8f030..4ae22776344 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -228,3 +228,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 70f9e0f1088..f511a5d177c 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -222,3 +222,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index bd19abe99b1..91237c691c0 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -223,3 +223,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index b2b298d62a8..d120575d9af 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -219,4 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
-"Mixing transactional and non-transactional tables disabled by option",
\ No newline at end of file
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index a4f9fa2223f..929b97e6146 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -223,3 +223,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index edc24953296..03589a91c77 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -219,3 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 43f77d698f4..deded796403 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -222,3 +222,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 7466abea5b4..c6255689ee4 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -219,3 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 6eabaf1fbd9..fbedda7e329 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -221,3 +221,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 036b59fe320..f419ddb7e0c 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -219,3 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 0ee0e80a541..2f4b72f8cc1 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -221,3 +221,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 8864acb5e7e..f5f5539b8a2 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -219,3 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 29b9c260fb9..d87da187577 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -221,3 +221,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index c2cad5de067..1d54c9aec03 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -221,3 +221,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 38515256a3c..1c93fcc7f8f 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -223,3 +223,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 0d907aa4f14..29a52900b24 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -219,3 +219,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 3c47a149e3a..8f957302f30 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -223,3 +223,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index e030072c686..dc350a242a3 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -222,3 +222,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 22360c08c9b..f7db353db3f 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -227,3 +227,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 237e1d2716f..f10908a33ba 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -220,3 +220,4 @@
 "Wrong usage of %s and %s",
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 3dd14c8b613..5bdbf78e6cf 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -219,3 +219,4 @@
 "Felaktig använding av %s and %s",
 "SELECT kommandona har olika antal kolumner"
 "Kan inte utföra kommandot emedan du har ett READ lås",
+"Blandning av transaktionella och icke-transaktionella tabeller är stoppat",