• unknown's avatar
    Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 · 9bf16868
    unknown authored
    into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
    
    
    BitKeeper/etc/ignore:
      auto-union
    client/mysqldump.c:
      Auto merged
    mysql-test/r/bdb.result:
      Auto merged
    mysql-test/r/type_timestamp.result:
      Auto merged
    mysql-test/r/udf.result:
      Auto merged
    mysql-test/t/bdb.test:
      Auto merged
    mysql-test/t/type_timestamp.test:
      Auto merged
    mysys/my_lib.c:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/r/func_time.result:
      manual merge
    mysql-test/r/mysqldump.result:
      manual merge
    mysql-test/t/func_time.test:
      manual merge
    mysql-test/t/mysqldump.test:
      manual merge
    sql/log.cc:
      manual merge
    sql/sp_head.cc:
      manual merge
    sql/sql_table.cc:
      manual merge
    9bf16868
.bzrignore 45.4 KB