• unknown's avatar
    after merge fix · 46fbe074
    unknown authored
    
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/share/errmsg.txt:
      manual merge
    46fbe074
set_var.cc 127 KB