diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-11-16 13:25:55 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-11-16 13:25:55 +0300 |
| commit | ec845335ac32a81d8d88245a1df4c74965b76f42 (patch) | |
| tree | c90d750e2c924c20e2f6b64eb1a1fc607e924038 /sql/item_cmpfunc.cc | |
| parent | 413d2e28b69162d4918c1bd87017c95d07c399ec (diff) | |
| parent | e40e8052e89ada24a79c827cf38271beed756759 (diff) | |
| download | mariadb-git-ec845335ac32a81d8d88245a1df4c74965b76f42.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/func_in.result:
Manual merge. Add "End of 5.0 tests".
mysql-test/t/func_in.test:
Manual merge. Add "End of 5.0 tests".
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 9a400d60ae6..70a8622af85 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2465,7 +2465,6 @@ void Item_func_in::fix_length_and_dec() if (cmp_type == STRING_RESULT) in_item->cmp_charset= cmp_collation.collation; } - maybe_null= args[0]->maybe_null; max_length= 1; } |