diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:27:39 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:27:39 +0100 |
| commit | b4442bb2d664e20d4d1ea732fc8bbffab2c39e2d (patch) | |
| tree | 00e65b3fed9adda014aa681930fa678837401caa /BitKeeper | |
| parent | f2905a90948cbff28afe1fbb3c6ee01c857041d7 (diff) | |
| parent | e5c1656e978894d3c021ce4e702c9e03ef0fe7ca (diff) | |
| download | mariadb-git-b4442bb2d664e20d4d1ea732fc8bbffab2c39e2d.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/ignore:
auto-union
mysys/my_getopt.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/r/type_enum.result:
Use local
mysql-test/t/type_enum.test:
Use local
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/gone | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 80830a01906..5bf77a89052 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -458,6 +458,12 @@ ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145 fs holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588 holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614 +jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54 +jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83 +jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af +jani@a88-113-38-195.elisa-laajakaista.fi|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16 +jani@a88-113-38-195.elisa-laajakaista.fi|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966 +jani@a88-113-38-195.elisa-laajakaista.fi|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3 jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554 jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa |