summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authormonty@tik.mysql.fi <>2001-07-10 15:53:08 +0300
committermonty@tik.mysql.fi <>2001-07-10 15:53:08 +0300
commitfc81fdb4ba76c25bb387ede8fd879a4392ea783e (patch)
tree6c8e56d350fb233a41c963d85544d41c0151c8ec /sql/share
parentca771c46bbe5e9ea7742902f9116f3e210e92fea (diff)
downloadmariadb-git-fc81fdb4ba76c25bb387ede8fd879a4392ea783e.tar.gz
Redefinition of myisam_bulk_insert_tree_size
Removed new error message Fixed test case for varbinary Threads are again killable in "merge_buffers" Cleanup of sql_repl.cc SHOW OPEN TABLES now works when no tables are opened
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/czech/errmsg.txt3
-rw-r--r--sql/share/danish/errmsg.txt3
-rw-r--r--sql/share/dutch/errmsg.txt3
-rw-r--r--sql/share/english/errmsg.txt3
-rw-r--r--sql/share/estonian/errmsg.txt3
-rw-r--r--sql/share/french/errmsg.txt3
-rw-r--r--sql/share/german/errmsg.txt3
-rw-r--r--sql/share/greek/errmsg.txt3
-rw-r--r--sql/share/hungarian/errmsg.txt3
-rw-r--r--sql/share/italian/errmsg.txt3
-rw-r--r--sql/share/japanese/errmsg.txt3
-rw-r--r--sql/share/korean/errmsg.txt3
-rw-r--r--sql/share/norwegian-ny/errmsg.txt3
-rw-r--r--sql/share/norwegian/errmsg.txt3
-rw-r--r--sql/share/polish/errmsg.txt3
-rw-r--r--sql/share/portuguese/errmsg.txt3
-rw-r--r--sql/share/romanian/errmsg.txt3
-rw-r--r--sql/share/russian/errmsg.txt3
-rw-r--r--sql/share/slovak/errmsg.txt3
-rw-r--r--sql/share/spanish/errmsg.txt3
-rw-r--r--sql/share/swedish/errmsg.txt11
21 files changed, 25 insertions, 46 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index afd4c6363ac..8fb28bb5aa7 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -222,5 +222,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index c481113e378..aa5ce318779 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -216,5 +216,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index c37554009ae..5aebadb910a 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index eadca864949..975227538c5 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index a27c7f4f9b7..33c061e1eeb 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -217,5 +217,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 18186b61204..bbdfbf8e1b5 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 073e33bd443..d12dc7caedc 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -216,5 +216,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 1e5d10eac17..b86e34e8cc4 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 6510c856b2d..80cc9da65f0 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -215,5 +215,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 070bc7ca8d1..08c91323c97 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index c52bd19d00c..ffea1e1ceee 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -215,5 +215,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 9f5db7b6f97..5359ed17c69 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index cac6a00fa92..cf4d0de9200 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -215,5 +215,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 059ccad2670..22d4e4b52bd 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -215,5 +215,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index efd36ac3049..31627a41d5c 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -217,5 +217,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index bf049ec6b43..8542b661698 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -213,5 +213,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 9272418e533..ed211d3694b 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -217,5 +217,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 0c369b3099c..7965ba0b789 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -216,5 +216,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 189180845d3..9504f817d1c 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -221,5 +221,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index e3ef7edd743..f20fa57dd31 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -214,5 +214,4 @@
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"Error when executing command %s: %-.128s",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 10cc61579ff..9e866bc510a 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -209,9 +209,8 @@
"Lock wait timeout exceeded",
"The total number of locks exceeds the lock table size",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"DROP DATABASE not allowed while thread is holding global read lock",
-"CREATE DATABASE not allowed while thread is holding global read lock",
-"Error connecting to master: %-.128s",
-"Error running query on master: %-.128s",
-"Error in SHOW BINLOG EVENTS: %-.128s",
-"Error in SHOW NEW MASTER: %-.128s",
+"DROP DATABASE är inte tillåtet när man har ett globalt läs-lås",
+"CREATE DATABASE är inte tillåtet när man har ett globalt läs-lås",
+"Fick fel vid anslutning till master: %-.128s",
+"Fick fel vid utförande av command på mastern: %-.128s",
+"Fick fel vid utförande av %s: %-.128s",
View Lorry Controller Status