• unknown's avatar
    Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491 · a45938bf
    unknown authored
    into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
    
    
    mysql-test/t/sp-error.test:
      Auto merged
    sql/item.h:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    mysql-test/r/ps.result:
      SCCS merged
    mysql-test/r/sp-error.result:
      SCCS merged
    mysql-test/t/disabled.def:
      SCCS merged
    mysql-test/t/ps.test:
      SCCS merged
    a45938bf
item.h 84.6 KB