diff options
| author | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 10:37:42 +0200 |
|---|---|---|
| committer | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 10:37:42 +0200 |
| commit | 1d97c7484b981687394dc55412c5ed6e90968f98 (patch) | |
| tree | d1b77c4251367ce1bd587a448055defef41f40c9 /sql | |
| parent | 9a20ca1390268a8091106635feaf7056c047cbea (diff) | |
| parent | 99c63cff88f9cf5090dba916754844d192c63384 (diff) | |
| download | mariadb-git-1d97c7484b981687394dc55412c5ed6e90968f98.tar.gz | |
Merge devsrv-b.mysql.com:/data0/gshchepa/mysql-5.0-opt
into devsrv-b.mysql.com:/data0/gshchepa/mysql-5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item.cc:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 14 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index d98a37e3c32..0af3ae47eca 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -715,10 +715,16 @@ void Item::set_name(const char *str, uint length, CHARSET_INFO *cs) str++; } if (orig_len != length && !is_autogenerated_name) - push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_REMOVED_SPACES, ER(ER_REMOVED_SPACES), - str + length - orig_len); - + { + if (length == 0) + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_NAME_BECOMES_EMPTY, ER(ER_NAME_BECOMES_EMPTY), + str + length - orig_len); + else + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_REMOVED_SPACES, ER(ER_REMOVED_SPACES), + str + length - orig_len); + } } if (!my_charset_same(cs, system_charset_info)) { diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 8ecba1d4be0..30cf85f3181 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5656,6 +5656,8 @@ ER_ADMIN_WRONG_MRG_TABLE eng "Table '%-.64s' is differently defined or of non-MyISAM type or doesn't exist" ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT eng "Too high level of nesting for select" +ER_NAME_BECOMES_EMPTY + eng "Name '%-.64s' has become ''" ER_FOREIGN_SERVER_EXISTS eng "The foreign server, %s, you are trying to create already exists." ER_FOREIGN_SERVER_DOESNT_EXIST |