diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:49:34 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:49:34 -0400 |
| commit | 86d29fdf5ba12d20d0f67338ba42532b2c8d0072 (patch) | |
| tree | b736bca12458c274a367187260dac074842cd944 /sql/share | |
| parent | 4ec2071a8963ce6dd061ef4a172c902a0d761b28 (diff) | |
| parent | a418c8f5b1b001b4a2a3df8dde2df131945318de (diff) | |
| download | mariadb-git-86d29fdf5ba12d20d0f67338ba42532b2c8d0072.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/push_clone
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 62a362d0859..1befd15fe9d 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5956,3 +5956,9 @@ ER_CANT_DROP_LOG_TABLE eng "Cannot drop log table if log is enabled" ER_ONLY_INTEGERS_ALLOWED eng "Only normal integers allowed as number here" +ER_USERNAME + eng "user name" +ER_HOSTNAME + eng "host name" +ER_WRONG_STRING_LENGTH + eng "String '%-.70s' is too long for %s (should be no longer than %d)" |