-
unknown authored
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198 sql/item_timefunc.h: Auto merged sql/partition_info.cc: Auto merged sql/share/errmsg.txt: manual merge
34a11a32
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198 sql/item_timefunc.h: Auto merged sql/partition_info.cc: Auto merged sql/share/errmsg.txt: manual merge