diff options
| author | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-08-07 19:25:45 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.myoffice.izhnet.ru> | 2007-08-07 19:25:45 +0500 |
| commit | c6e88899460bd3478761f37a873a822f379a170d (patch) | |
| tree | 2abd528f18f707819e6b51df6ba1f19a5a9d7ddf /sql/sql_string.cc | |
| parent | 6c1edb11d44d7b4308c9d9ddb50bc41be895682d (diff) | |
| download | mariadb-git-c6e88899460bd3478761f37a873a822f379a170d.tar.gz | |
Reversing additional change suggested by Serg
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
Conversion between a latin1 column and an ascii string constant
stopped to work.
mysql-test/r/ctype_recoding.result:
Adding test case.
mysql-test/t/ctype_recoding.test:
Adding test case.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a87074c3359..9d7df73cd7a 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -263,8 +263,6 @@ bool String::needs_conversion(uint32 arg_length, (to_cs == &my_charset_bin) || (to_cs == from_cs) || my_charset_same(from_cs, to_cs) || - (my_charset_is_ascii_based(to_cs) && - my_charset_is_8bit_pure_ascii(from_cs)) || ((from_cs == &my_charset_bin) && (!(*offset=(arg_length % to_cs->mbminlen))))) return FALSE; |