diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-07-29 17:12:14 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-07-29 17:12:14 +0500 |
| commit | 8d7b54b7c225bb3395ea8fa0692c6799032d7304 (patch) | |
| tree | 66fd9cf224c10568a1a31e3da1c92339f9439fa3 /sql/item_strfunc.cc | |
| parent | 8713e9791ce79bd8f4e939c4c8e420809cd7832b (diff) | |
| download | mariadb-git-8d7b54b7c225bb3395ea8fa0692c6799032d7304.tar.gz | |
A new separate error message: Unknown collation 'blablabla'
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 4e35e90b429..b4f4df6968d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2206,7 +2206,13 @@ void Item_func_set_collation::fix_length_and_dec() set_collation= get_charset_by_csname(args[0]->charset()->csname, MY_CS_BINSORT,MYF(0)); else - set_collation= get_charset_by_name(colname,MYF(0)); + { + if (!(set_collation= get_charset_by_name(colname,MYF(0)))) + { + my_error(ER_UNKNOWN_COLLATION, MYF(0), colname); + return; + } + } if (!set_collation || !my_charset_same(args[0]->charset(),set_collation)) { |