diff options
| author | unknown <monty@mysql.com> | 2005-03-30 16:01:30 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-30 16:01:30 +0300 |
| commit | eed80718913dfdd8e59ca0e84d39bccb98cf9e7f (patch) | |
| tree | 3205e6a8c1f31cb04edb27c1060b5e7128b4327b /sql/share | |
| parent | 8d8cb24efb8dd763c44bbf7b97dfe719e0550023 (diff) | |
| parent | a5b1b9d92474e4e1e30e7b1a3570cf4531533b03 (diff) | |
| download | mariadb-git-eed80718913dfdd8e59ca0e84d39bccb98cf9e7f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/log_event.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 7249605f10c..f7a6fe6c7e8 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5334,3 +5334,5 @@ ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR eng "Can't load value from file with fixed size rows to variable" ER_CANT_CREATE_USER_WITH_GRANT 42000 eng "You are not allowed to create a user with GRANT" +ER_WRONG_VALUE_FOR_TYPE + eng "Incorrect %-.32s value: '%-.128s' for function %-.32s" |