• unknown's avatar
    Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 26938810
    unknown authored
    into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
    
    
    mysql-test/r/func_in.result:
      Auto merged
    mysql-test/r/insert_update.result:
      Auto merged
    mysql-test/r/type_datetime.result:
      Auto merged
    mysql-test/t/insert_update.test:
      Auto merged
    mysql-test/t/type_datetime.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/handler.cc:
      Manual merge
    sql/item_cmpfunc.cc:
      Manual merge
    sql/item_cmpfunc.h:
      Manual merge
    sql/item_func.h:
      Manual merge
    sql/sql_class.h:
      Manual merge
    26938810
func_in.result 15.1 KB