diff options
| author | unknown <tim@donna.mysql.com> | 2001-01-14 12:56:01 +0200 |
|---|---|---|
| committer | unknown <tim@donna.mysql.com> | 2001-01-14 12:56:01 +0200 |
| commit | 4e264107df5c286d0a06ff28699aec398e36e684 (patch) | |
| tree | 98a81b367d24460a9d0417cc08c4af85d5ab9e87 /BitKeeper | |
| parent | 4d1bb5adc5ed566c10adc0fcb0779f57e7df3f66 (diff) | |
| parent | 349d554b24a75de322bb72f4306876ee746a65cb (diff) | |
| download | mariadb-git-4e264107df5c286d0a06ff28699aec398e36e684.tar.gz | |
Merge donna.mysql.com:/home/my/bk/mysql
into donna.mysql.com:/home/tim/my/work
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/gone | 1 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 8cb2c630f4f..7ea90fa5f39 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -316,3 +316,4 @@ sasha@work.mysql.com|BitKeeper/etc/logging_ok|20001214015456|29919|32b6551b8288c serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.dummy.result|20001206231604|05053|bf7e6d609f22b897 serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.result|20001206231609|46662|db2ef2e717ab8332 mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b9394876 +mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b93948768 diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index b32a9b8dd90..1c8b711ba8e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ jani@hynda.mysql.fi monty@donna.mysql.com +mwagner@evoq.home.mwagner.org tim@donna.mysql.com |