• unknown's avatar
    Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 6e776686
    unknown authored
    into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
    
    
    mysql-test/t/grant.test:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    strings/ctype-simple.c:
      Auto merged
    mysql-test/r/grant.result:
      Manual merge
    6e776686
sql_select.cc 523 KB