diff options
| author | unknown <monty@mysql.com> | 2004-11-12 11:17:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-12 11:17:53 +0200 |
| commit | dbd0b3b052e593ba58ff98b87ef24499131bddb2 (patch) | |
| tree | 59f4a8722fd9657366da60b4af149031105872ab /BitKeeper | |
| parent | 42c274dde76b2fac99b40173a39f91781dac01fd (diff) | |
| parent | f24859396b79e21708a5738e3aadb4ee2514aba8 (diff) | |
| download | mariadb-git-dbd0b3b052e593ba58ff98b87ef24499131bddb2.tar.gz | |
merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
Auto merged
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/default.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log.cc:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqldump.c:
merge with 4.0
(This only reorders options)
sql/ha_innodb.cc:
merge with 4.0 (Keep original code)
sql/time.cc:
Note that part of this patch is done in my_time.c
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ac02fa84bbc..1f1918027e2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -195,6 +195,7 @@ tim@bitch.mysql.fi tim@black.box tim@hundin.mysql.fi tim@sand.box +tim@siva.hindu.god tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com |