Fix for BUG#2757

"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".

23 files changed, 23 insertions, 23 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 917b2259e24..480700a0a2a 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -301,4 +301,4 @@ character-set=latin2
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 591e007f5a6..1e3b2178fb5 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -295,4 +295,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 3a0d77187bf..b27e74a0175 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -303,4 +303,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 38ca4966dfe..fef7baa02b4 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -292,4 +292,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working",
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index f0882d5602b..494f38048b1 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -297,4 +297,4 @@ character-set=latin7
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index d3c7c3ebde1..3e70e7ccb7e 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -292,4 +292,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 48eff8831d5..8d27b9f43f8 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -304,4 +304,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 1e3c436e3d0..0393c0ba39c 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -292,4 +292,4 @@ character-set=greek
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 402933d7ef7..6663bccc94f 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -294,4 +294,4 @@ character-set=latin2
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index d9be6ebb32d..42c71ee90e5 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -292,4 +292,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index cc36dd60e85..f145b23e445 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -294,4 +294,4 @@ character-set=ujis
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 0bbea735a09..06c7c74109c 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -292,4 +292,4 @@ character-set=euckr
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 2372e7a9690..14f2515b086 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -294,4 +294,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index f946e988fb0..2a46ef228c4 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -294,4 +294,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index c6bb914d38c..1599184465f 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -296,4 +296,4 @@ character-set=latin2
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 537162fc1d0..2caa242a69d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -293,4 +293,4 @@ character-set=latin1
 "'%s' И desatualizado. Use '%s' em seu lugar.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 8da92d48883..50ec3ac6802 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -296,4 +296,4 @@ character-set=latin2
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index d5d91deb280..4a1f9eccbce 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -294,4 +294,4 @@ character-set=koi8r
 "'%s' is deprecated. Use '%s' instead.",
 "Таблица %-.100s в %s не может изменятся.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 8fa7933b871..1ffda2b94b2 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -287,4 +287,4 @@ character-set=cp1250
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 90fbe450bb1..b7563f1a562 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -300,4 +300,4 @@ character-set=latin2
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 644a5c7a515..1296c4cc72a 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -294,4 +294,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 22a6cecd773..4e373d68e33 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -292,4 +292,4 @@ character-set=latin1
 "'%s' is deprecated. Use '%s' instead.",
 "The target table %-.100s of the %s is not updatable.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 2d4ce67e2e5..5eb62a2c7f2 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -297,4 +297,4 @@ character-set=koi8u
 "'%s' is deprecated. Use '%s' instead.",
 "Таблиця %-.100s у %s не може оновлюватись.",
 "The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"The MySQL server is running with the %s option so cannot execute this statement"