diff options
| author | unknown <anozdrin@mysql.com> | 2006-06-20 18:28:28 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-06-20 18:28:28 +0400 |
| commit | 46845cf357ba5d822b07e025142654673191a6c4 (patch) | |
| tree | 2ec04ccb6218dd72ab8207d0d2269d1db34b35af /include | |
| parent | 89fc7fdb056fc8aa5ffb5da229b460e9863f0641 (diff) | |
| parent | 3435f614c2951714c3c93ff7fcdc6325f7ad2e05 (diff) | |
| download | mariadb-git-46845cf357ba5d822b07e025142654673191a6c4.tar.gz | |
Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-merged
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.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions