• unknown's avatar
    Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a0a216bb
    unknown authored
    into  gleb.loc:/home/uchum/work/bk/5.1-opt
    
    
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    mysql-test/t/view.test:
      Merge with 5.0-opt.
    sql/sp_head.cc:
      Merge with 5.0-opt.
    a0a216bb
query_cache.test 38.8 KB