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".
This commit is contained in:
unknown 2006-11-16 13:25:55 +03:00
commit ec845335ac
3 changed files with 34 additions and 2 deletions

View file

@ -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;
}