summaryrefslogtreecommitdiff
path: root/sql/share/greek/errmsg.txt
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-06-21 16:15:00 -0600
committerunknown <sasha@mysql.sashanet.com>2001-06-21 16:15:00 -0600
commitf1a5dafce22419fa5402d784e1410d8d8db2a9e7 (patch)
tree23328c5b7144436a44f8c85ec21eeeb58d330413 /sql/share/greek/errmsg.txt
parent5756e49838d60f5b70beccab3cbee3d52da5ad5e (diff)
parentd88fdc2bde980da6a92be3ca9b8be2f7fe378df8 (diff)
downloadmariadb-git-f1a5dafce22419fa5402d784e1410d8d8db2a9e7.tar.gz
merge
sql/slave.cc: Auto merged sql/sql_db.cc: Auto merged
Diffstat (limited to 'sql/share/greek/errmsg.txt')
-rw-r--r--sql/share/greek/errmsg.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 778c4483bd1..8f81fcfda31 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -209,5 +209,5 @@
"Lock wait timeout exceeded",
"The total number of locks exceeds the lock table size",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
-"Error connecting to master: %-.128s",
-"Error running query on master: %-.128s",
+"DROP DATABASE not allowed while thread is holding global read lock",
+"CREATE DATABASE not allowed while thread is holding global read lock",