12 files changed, 13 insertions, 12 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index e9f3b997a96..17651303714 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -206,7 +206,7 @@
 "Nezn-Bámá systémová promìnná '%-.64s'",
 "Tabulka '%-.64s' je ozna-Bèena jako poru¹ená a mìla by být opravena",
 "Tabulka '%-.64s' je ozna-Bèena jako poru¹ená a poslední (automatická?) oprava se nezdaøila",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 88ab604fbcf..ccb452f0cca 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -197,7 +197,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
@@ -242,3 +242,4 @@
 "Key reference and table reference doesn't match",
 "Subselect return more than 1 field",
 "Subselect return more than 1 record",
+"Unknown prepared statement handler (%ld) given to %s",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index a344ed2df9e..f9117bdd44e 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -197,7 +197,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 9e88f2c3e2c..9bf7121d309 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -199,7 +199,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 07bdcd6bee5..215a30c5062 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -199,7 +199,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 57f990fdc04..0560442ddb8 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -197,7 +197,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 37f7f2fac01..bc9f9829945 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -199,7 +199,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 93f4090d697..2af2e7809b0 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -199,7 +199,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 3b43ce539c7..93578e6119d 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -201,7 +201,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index ce237d755d4..cde6ab9a4f4 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -201,7 +201,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 9912e4c9191..4c5cf834262 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -205,7 +205,7 @@
 "Unknown system variable '%-.64s'",
 "Table '%-.64s' is marked as crashed and should be repaired",
 "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
-"Warning:  Some non-transactional changed tables couldn't be rolled back",
+"Some non-transactional changed tables couldn't be rolled back",
 "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
 "This operation cannot be performed with a running slave, run SLAVE STOP first",
 "This operation requires a running slave, configure slave and do SLAVE START",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index f6553f247b6..587c9cab406 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",