• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 1f0c2ab3
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-clean
    
    
    BitKeeper/deleted/.del-not_windows.inc:
      Delete: mysql-test/include/not_windows.inc
    mysql-test/r/type_datetime.result:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/rpl_flush_tables.test:
      Auto merged
    sql-common/my_time.c:
      Auto merged
    mysql-test/r/query_cache.result:
      Resolve conflict
    1f0c2ab3
query_cache.test 21 KB