• unknown's avatar
    Merge mysql.com:/home/kostja/mysql/mysql-5.0-root · 99e21d7d
    unknown authored
    into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
    
    
    BitKeeper/deleted/.del-ndb_load.result:
      Delete: mysql-test/r/ndb_load.result
    BitKeeper/deleted/.del-ndb_load.test:
      Delete: mysql-test/t/ndb_load.test
    extra/perror.c:
      Auto merged
    mysql-test/r/fulltext.result:
      Auto merged
    mysql-test/r/ndb_blob.result:
      Auto merged
    mysql-test/r/sp-code.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/fulltext.test:
      Auto merged
    mysql-test/t/sp-destruct.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/ha_ndbcluster.h:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp.h:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
      Auto merged
    storage/ndb/src/kernel/main.cpp:
      Auto merged
    storage/ndb/src/kernel/vm/Configuration.cpp:
      Auto merged
    storage/ndb/src/kernel/vm/Configuration.hpp:
      Auto merged
    storage/ndb/src/ndbapi/NdbBlob.cpp:
      Auto merged
    storage/ndb/test/ndbapi/testBlobs.cpp:
      Auto merged
    storage/ndb/tools/delete_all.cpp:
      Auto merged
    mysql-test/t/disabled.def:
      Manual merge.
    99e21d7d
fulltext.result 17.8 KB