• unknown's avatar
    Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 59937a52
    unknown authored
    into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/ndb_basic.result:
      Auto merged
    mysql-test/t/ndb_basic.test:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
      Auto merged
    sql/ha_ndbcluster.cc:
      SCCS merged
    sql/ha_ndbcluster.h:
      SCCS merged
    59937a52
ndb_basic.test 14.5 KB