diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-01-19 14:29:01 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-01-19 14:29:01 -0800 |
| commit | 115fbd6b3c2f8cbe3556a637d947b9e5d9cc8a2d (patch) | |
| tree | b885970ba89172d5d3189ad8151595845ac1cabb /.bzrignore | |
| parent | dc5815904e668d26900e7594c869bf868e79cd24 (diff) | |
| download | mariadb-git-115fbd6b3c2f8cbe3556a637d947b9e5d9cc8a2d.tar.gz | |
Merge recycle.(none):/src/bug22807/my50-bug22807
into recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
BitKeeper/deleted/.del-libndb.ver.in:
Rename: ndb/src/libndb.ver.in -> BitKeeper/deleted/.del-libndb.ver.in
BitKeeper/etc/ignore:
Added storage/ndb/src/libndb.ver to the ignore list
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e00d2a16187..46d0f952445 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2934,3 +2934,4 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +storage/ndb/src/libndb.ver |