• unknown's avatar
    Merge mysql.com:/home/ram/work/b27515/b27515.4.1 · b8850e15
    unknown authored
    into  mysql.com:/home/ram/work/b27515/b27515.5.0
    
    
    mysql-test/r/grant.result:
      will be merged in a post-merge CS
    mysql-test/t/grant.test:
      manual merge
    sql/sql_parse.cc:
      manual merge
    b8850e15
sql_parse.cc 225 KB