• unknown's avatar
    Merging · c5fc0d43
    unknown authored
    
    mysql-test/r/func_str.result:
      Auto merged
    sql/item_geofunc.cc:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    c5fc0d43
mysqld_error.h 11 KB