• unknown's avatar
    Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 200c69e3
    unknown authored
    into  gleb.loc:/home/uchum/work/bk/5.1-opt
    
    
    mysql-test/r/func_str.result:
      Auto merged
    mysql-test/t/func_str.test:
      Auto merged
    mysql-test/r/bigint.result:
      Merge with 5.0-opt.
    mysql-test/t/bigint.test:
      Merge with 5.0-opt.
    sql/item_func.cc:
      Merge with 5.0-opt.
    200c69e3
item_func.cc 138 KB