diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-13 15:24:29 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-13 15:24:29 +0300 |
| commit | 638a96783ecb84879df9c908384df89bceafd2a1 (patch) | |
| tree | a5cef3d3ee3c549aaeeb4d9229dee2f60a467318 /sql/share/english/errmsg.txt | |
| parent | 91df94629de9f3693c8728768f3f0904bd8a87d5 (diff) | |
| download | mariadb-git-638a96783ecb84879df9c908384df89bceafd2a1.tar.gz | |
Fix error messages after merge from 3.23
include/mysqld_error.h:
Fix error messages
mysql-test/t/fulltext.test:
Fixed wrong error numbers
mysql-test/t/union.test:
Update error numbers after merge with 3.23
sql/share/czech/errmsg.txt:
Fix of merge
sql/share/danish/errmsg.txt:
Updated error messages from 3.23
sql/share/dutch/errmsg.txt:
Updated error messages from 3.23
sql/share/english/errmsg.txt:
Updated error messages
sql/share/estonian/errmsg.txt:
Fix of merge
sql/share/french/errmsg.txt:
Fix of merge
sql/share/german/errmsg.txt:
Fix of merge
sql/share/greek/errmsg.txt:
Fix of merge
sql/share/hungarian/errmsg.txt:
Fix of merge
sql/share/italian/errmsg.txt:
Fix of merge
sql/share/japanese/errmsg.txt:
Fix of merge
sql/share/korean/errmsg.txt:
Fix of merge
sql/share/norwegian-ny/errmsg.txt:
Fix of merge
sql/share/norwegian/errmsg.txt:
Fix of merge
sql/share/polish/errmsg.txt:
Fix of merge
sql/share/portuguese/errmsg.txt:
Updated error messages
sql/share/romanian/errmsg.txt:
Fix of merge
sql/share/russian/errmsg.txt:
Fix of merge
sql/share/slovak/errmsg.txt:
Fix of merge
sql/share/spanish/errmsg.txt:
Fix of merge
sql/share/swedish/errmsg.txt:
Fix of merge
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 61c983eefbf..d8e3ed1d538 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -153,7 +153,7 @@ "You have an error in your SQL syntax", "Delayed insert thread couldn't get requested lock for table %-.64s", "Too many delayed threads in use", -"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html", +"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)", "Got a packet bigger than 'max_allowed_packet'", "Got a read error from the connection pipe", "Got an error from fcntl()", @@ -185,7 +185,7 @@ "Got error %d during ROLLBACK", "Got error %d during FLUSH_LOGS", "Got error %d during CHECKPOINT", -"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html", +"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)", "The handler for the table does not support binary table dump", "Binlog closed, cannot RESET MASTER", "Failed rebuilding the index of dumped table '%-.64s'", @@ -212,9 +212,9 @@ "DROP DATABASE not allowed while thread is holding global read lock", "CREATE DATABASE not allowed while thread is holding global read lock", "Wrong arguments to %s", +"%-.32s@%-.64s is not allowed to create new users", "Error connecting to master: %-.128s", "Error running query on master: %-.128s", "Error when executing command %s: %-.128s", "Wrong usage of %s and %s", "The used SELECT statements have a different number of columns", -"%-.32s@%-.64s is not allowed to create new users", |