diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-06-21 16:15:00 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-06-21 16:15:00 -0600 |
commit | d310ce76991a8729b575b7c1404e97d2619d7739 (patch) | |
tree | 23328c5b7144436a44f8c85ec21eeeb58d330413 /sql/share/estonian/errmsg.txt | |
parent | 63bd9b50530145b5f2d5ae5b8a0c9d019eb9771a (diff) | |
parent | a7fa56c1736a19ae968bdf536e563a86bcb17c61 (diff) | |
download | mariadb-git-d310ce76991a8729b575b7c1404e97d2619d7739.tar.gz |
merge
sql/slave.cc:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/share/estonian/errmsg.txt')
-rw-r--r-- | sql/share/estonian/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 858618285b2..1418295b417 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -213,5 +213,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", |