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 | f1a5dafce22419fa5402d784e1410d8d8db2a9e7 (patch) | |
tree | 23328c5b7144436a44f8c85ec21eeeb58d330413 /sql/share/hungarian | |
parent | 5756e49838d60f5b70beccab3cbee3d52da5ad5e (diff) | |
parent | d88fdc2bde980da6a92be3ca9b8be2f7fe378df8 (diff) | |
download | mariadb-git-f1a5dafce22419fa5402d784e1410d8d8db2a9e7.tar.gz |
merge
sql/slave.cc:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/share/hungarian')
-rw-r--r-- | sql/share/hungarian/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index b1bb76cd6c7..84d8c56cd04 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -211,5 +211,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", |