• unknown's avatar
    Merge moonbone.local:/work/latest-4.1-opt-mysql · cb96e8bc
    unknown authored
    into  moonbone.local:/work/latest-5.0-opt-mysql
    
    
    mysql-test/t/func_str.test:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    mysql-test/r/delete.result:
      Manual merge
    mysql-test/r/func_str.result:
      Manual merge
    mysql-test/t/delete.test:
      Manual merge
    cb96e8bc
func_str.result 76.8 KB