diff options
| author | unknown <jonas@eel.(none)> | 2005-08-19 10:13:35 +0200 |
|---|---|---|
| committer | unknown <jonas@eel.(none)> | 2005-08-19 10:13:35 +0200 |
| commit | 91b192142d7965ccde40a064d3e34f99514d807d (patch) | |
| tree | 47c0cafeb77bf6177678c076a54bf63a1d80f25d | |
| parent | 8ff3f16df522b76e77c9cfedb4c88fab39657da9 (diff) | |
| parent | 9c668f7f02b0c4f4a05fe801b259187230184afd (diff) | |
| download | mariadb-git-91b192142d7965ccde40a064d3e34f99514d807d.tar.gz | |
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-4.1-push
| -rw-r--r-- | BitKeeper/etc/config | 1 | ||||
| -rw-r--r-- | ndb/src/kernel/Makefile.am | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index 6ddd492ebc4..0f0666d5050 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -70,5 +70,6 @@ hours: [serg:]checkout:get [arjen:]checkout:get [nick:]checkout:get +[jonas:]checkout:get checkout:edit eoln:unix diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am index 55d3c5a578f..389cb85c1d8 100644 --- a/ndb/src/kernel/Makefile.am +++ b/ndb/src/kernel/Makefile.am @@ -23,7 +23,6 @@ INCLUDES += \ -Iblocks/backup \ -Iblocks/dbutil \ -Iblocks/suma \ - -Iblocks/grep \ -Iblocks/dbtux LDADD += \ @@ -41,7 +40,6 @@ LDADD += \ blocks/backup/libbackup.a \ blocks/dbutil/libdbutil.a \ blocks/suma/libsuma.a \ - blocks/grep/libgrep.a \ blocks/dbtux/libdbtux.a \ vm/libkernel.a \ error/liberror.a \ |