• unknown's avatar
    Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1 · 6fef0c8b
    unknown authored
    into  dator6.(none):/home/mikael/mysql_clones/bug18198
    
    
    mysql-test/t/partition_hash.test:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/item.h:
      manual merge
    sql/item_cmpfunc.h:
      manual merge
    sql/item_func.h:
      manual merge
    sql/item_strfunc.h:
      manual merge
    sql/item_timefunc.h:
      manual merge
    sql/item_xmlfunc.h:
      manual merge
    sql/partition_info.cc:
      manual merge
    sql/sql_partition.cc:
      manual merge
    6fef0c8b
item_timefunc.h 27.6 KB