• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-root · 1fb492b2
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    BitKeeper/deleted/.del-rpl_ignore_table.result:
      Delete: mysql-test/r/rpl_ignore_table.result
    BitKeeper/deleted/.del-rpl_multi_update4.result:
      Delete: mysql-test/r/rpl_multi_update4.result
    BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
      Delete: mysql-test/t/rpl_ignore_table-slave.opt
    BitKeeper/deleted/.del-rpl_ignore_table.test:
      Delete: mysql-test/t/rpl_ignore_table.test
    BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
      Delete: mysql-test/t/rpl_multi_update4-slave.opt
    BitKeeper/deleted/.del-disabled.def:
      Auto merged
    BitKeeper/deleted/.del-rpl_multi_update4.test:
      Delete: mysql-test/t/rpl_multi_update4.test
    heap/hp_create.c:
      Auto merged
    mysql-test/r/date_formats.result:
      Auto merged
    mysql-test/r/myisam.result:
      Auto merged
    mysql-test/r/update.result:
      Auto merged
    mysql-test/t/date_formats.test:
      Auto merged
    mysql-test/t/heap.test:
      Auto merged
    mysql-test/t/kill.test:
      Auto merged
    mysql-test/t/update.test:
      Auto merged
    ndb/include/mgmapi/mgmapi_config_parameters.h:
      Auto merged
    ndb/test/ndbapi/testBlobs.cpp:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    configure.in:
      Manual merge.
    libmysql/libmysql.c:
      Manual merge.
    mysql-test/r/heap.result:
      Manual merge.
    mysql-test/r/heap_hash.result:
      Manual merge.
    mysql-test/r/kill.result:
      Manual merge.
    sql/ha_heap.cc:
      Manual merge.
    sql/ha_heap.h:
      Manual merge.
    sql/item_timefunc.cc:
      Manual merge.
    sql/sql_class.cc:
      Manual merge.
    sql/sql_parse.cc:
      Manual merge.
    sql/sql_update.cc:
      Manual merge.
    tests/mysql_client_test.c:
      Manual merge.
    1fb492b2
heap.test 13.4 KB