• unknown's avatar
    Merge magare.gmz:/home/kgeorge/mysql/work/B27786-5.0-opt · 36e733a8
    unknown authored
    into  magare.gmz:/home/kgeorge/mysql/work/B27786-addon-5.1-opt
    
    
    mysql-test/r/subselect3.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    sql/item_subselect.h:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    mysql-test/t/view.test:
      fixed testcase merge 5.0->5.1
    sql/sql_lex.h:
      merge fixes : 5.0->5.1
    36e733a8
sql_lex.h 43.6 KB