• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-13134 · 9519987c
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-runtime
    
    
    mysql-test/t/heap.test:
      Auto merged
    mysql-test/r/heap.result:
      Manual merge (use local)
    mysql-test/r/ps.result:
      Manual merge (use local)
    mysql-test/t/ps.test:
      Manual merge.
    sql/field.cc:
      Manual merge.
    sql/field.h:
      Manual merge.
    sql/sql_parse.cc:
      Manual merge.
    sql/sql_table.cc:
      Manual merge.
    9519987c
field.h 58.9 KB