diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-07 08:10:30 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-07 08:10:30 -0700 |
| commit | a768562aa3da9a0942ff58ea4f69cf90e8e04d25 (patch) | |
| tree | e345f358c514e9be38a07069cf681345ced0958a /BitKeeper | |
| parent | d81d52953559068fcc8e748f754404aeefdeaf8e (diff) | |
| parent | a61853544ecb4415cc2665a5fd780b014f15743b (diff) | |
| download | mariadb-git-a768562aa3da9a0942ff58ea4f69cf90e8e04d25.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
Auto converge
configure.in:
Auto merged
mysql-test/misc/select.res:
***MISSING WEAVE***
BitKeeper/etc/ignore:
Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
mysql-test/mysql-test-run:
merge
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/gone | 2 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 355f5c6b067..18db75b7d5a 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -3,3 +3,5 @@ mwagner@evoq.home.mwagner.org|mysql-test/var/log/README|20001009213643|16203|df5 mwagner@evoq.home.mwagner.org|mysql-test/var/run/README|20001009213643|17062|acb305e4c2ed5990 mwagner@evoq.home.mwagner.org|mysql-test/var/tmp/README|20001009213643|17904|b32d866bfd50e72e mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5 +mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305 +sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54 diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index bc7425784fb..fd4f869760d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,2 +1,3 @@ jani@prima.mysql.com +sasha@mysql.sashanet.com serg@serg.mysql.com |