• unknown's avatar
    fix merge issues · c5c8e2f8
    unknown authored
    
    mysql-test/r/sp.result:
      manual merge
    sql/sql_lex.cc:
      merge typo
    c5c8e2f8
sp.result 148 KB