diff options
| author | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
| commit | e6ecbfd629bf92c84f270119405f4796464e7f4e (patch) | |
| tree | 7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /sql/share/english/errmsg.txt | |
| parent | a14542a61fbaabf30a2735a74401e4cd2734314d (diff) | |
| parent | 8c8244918fc37bb25656a5f8b451a362e4b16577 (diff) | |
| download | mariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz | |
merge
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/share/english/errmsg.txt')
| -rw-r--r-- | sql/share/english/errmsg.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 30e8894db08..6f423f879f8 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -206,8 +206,8 @@ "Could not create slave thread, check system resources", "User %-.64s has already more than 'max_user_connections' active connections", "You may only use constant expressions with SET", +"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", - - - |