• unknown's avatar
    Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged · 9f93f15b
    unknown authored
    into  mysql.com:/home/alik/MySQL/devel/5.1-merged
    
    
    BitKeeper/deleted/.del-im_life_cycle-im.opt:
      Delete: mysql-test/t/im_life_cycle-im.opt
    BitKeeper/deleted/.del-im_utils-im.opt:
      Delete: mysql-test/t/im_utils-im.opt
    mysql-test/lib/mtr_process.pl:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/im_daemon_life_cycle.result:
      Auto merged
    mysql-test/r/im_utils.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/t/im_daemon_life_cycle-im.opt:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    server-tools/instance-manager/instance_map.cc:
      Auto merged
    mysql-test/r/im_life_cycle.result:
      Manually merged.
    mysql-test/r/insert.result:
      Manually merged.
    mysql-test/t/im_daemon_life_cycle.imtest:
      Manually merged.
    mysql-test/t/im_life_cycle.imtest:
      Manually merged.
    mysql-test/t/im_utils.imtest:
      Manually merged.
    mysql-test/t/insert.test:
      Manually merged.
    server-tools/instance-manager/guardian.cc:
      Manually merged.
    server-tools/instance-manager/manager.cc:
      Manually merged.
    sql/sql_insert.cc:
      Manually merged.
    9f93f15b
im_life_cycle.result 2.9 KB