• unknown's avatar
    Merge fixes for #8248, #5569. · 33e74b14
    unknown authored
    
    mysql-test/r/func_str.result:
      Update results
    mysql-test/t/func_str.test:
      Merge test
    sql/item_strfunc.cc:
      Set charset on output string
    sql/item_strfunc.h:
      Merge
    sql/sql_parse.cc:
      Merge
    vio/viosocket.c:
      Merge
    33e74b14
item_strfunc.cc 71.6 KB