-
unknown authored
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1 client/sql_string.h: Auto merged sql/item_func.h: Auto merged sql/sql_string.h: Auto merged configure.in: Null merge. sql/item_strfunc.cc: Null merged
d1a31ef5
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1 client/sql_string.h: Auto merged sql/item_func.h: Auto merged sql/sql_string.h: Auto merged configure.in: Null merge. sql/item_strfunc.cc: Null merged