Commit b21e89bb authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents ce935275 94681d0f

sql/item_func.cc

+4 −5
Original line number Diff line number Diff line
@@ -1867,12 +1867,11 @@ longlong Item_func_inet_aton::val_int() 


double Item_func_match::val()

{

  /* If called uninitialized we should return neither NULL nor 0 (important

     for const_tables) so, let's return -1, which is obviously incorrect

     for normal operation, and could be easily spotted */



  if (ft_handler==NULL)

    return -1.0;

    init_search(1);



  if (null_value=(ft_handler==NULL))

    return 0.0;



  if (join_key)

  {