Commit 115fbd6b authored by unknown's avatar unknown

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
parent dc581590
...@@ -2934,3 +2934,4 @@ win/vs71cache.txt ...@@ -2934,3 +2934,4 @@ win/vs71cache.txt
win/vs8cache.txt win/vs8cache.txt
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
storage/ndb/src/libndb.ver
libndbclient_@NDB_SHARED_LIB_MAJOR_VERSION@ { global: *; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment