• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-9379 · 061406ba
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    sql/item.cc:
      Auto merged
    mysql-test/r/ps.result:
      Manual merge.
    mysql-test/t/ps.test:
      Manual merge.
    sql/item_func.cc:
      Manual merge.
    061406ba
item_func.cc 120 KB