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