diff options
| author | unknown <guilhem@mysql.com> | 2005-10-12 21:58:02 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-10-12 21:58:02 +0200 |
| commit | 8b1a32aeadf22776e2e3f8d1f67ee32f0e1fd80d (patch) | |
| tree | a42e8586944072e7730401a2c2d33f5f227c60c8 /BitKeeper/etc | |
| parent | 3f11381b7c27dba3a0b387b642f4353c4d18cb7e (diff) | |
| parent | 61dfc3347f013eadb46a5035cbf0479bcacc8f22 (diff) | |
| download | mariadb-git-8b1a32aeadf22776e2e3f8d1f67ee32f0e1fd80d.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-4.1
into mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
Auto merged
sql/log.cc:
Auto merged
sql/slave.h:
Auto merged
client/mysqltest.c:
manual merge
mysql-test/r/subselect.result:
manual merge
mysql-test/t/subselect.test:
manual merge
sql/log_event.cc:
manual merge
sql/log_event.h:
manual merge
sql/slave.cc:
manual merge
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 81e867e514f..b68810b77ac 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -73,5 +73,6 @@ hours: [nick:]checkout:get [jonas:]checkout:get [tomas:]checkout:get +[guilhem:]checkout:get checkout:edit eoln:unix |