• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-11458 · e199a025
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    sql/mysql_priv.h:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    mysql-test/r/ps.result:
      Manual merge.
    mysql-test/t/ps.test:
      Manual merge.
    sql/item.cc:
      Manual merge.
    sql/item.h:
      Manual merge.
    sql/item_subselect.h:
      Manual merge.
    sql/sql_parse.cc:
      Manual merge.
    sql/sql_prepare.cc:
      Manual merge.
    e199a025
ps.result 21.9 KB