• unknown's avatar
    Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 · f23adec9
    unknown authored
    into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
    
    
    mysql-test/r/func_misc.result:
      Manual merge
    mysql-test/t/func_misc.test:
      Manual merge
    sql/item_func.h:
      Manual merge
    sql/item_strfunc.cc:
      Manual merge
    f23adec9
func_misc.test 3.28 KB