• unknown's avatar
    Merge buzz.(none):/home/davi/mysql-5.0-runtime · 955b3e3d
    unknown authored
    into  buzz.(none):/home/davi/mysql-5.1-runtime
    
    
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    sql/sql_view.h:
      Auto merged
    sql/item.h:
      Manual merge
    sql/sql_prepare.cc:
      Manual merge
    sql/sql_view.cc:
      Manual merge
    955b3e3d
sql_view.h 1.63 KB