diff options
author | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
commit | 309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch) | |
tree | 0f73878fcf058ff862f3f7eb305aafae2ad3465d /.bzrignore | |
parent | a9853184d3b69a3802984e0994282dc3a3320296 (diff) | |
parent | 530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff) | |
download | mariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz |
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 4af6fdbbe88..699cb75cc72 100644 --- a/.bzrignore +++ b/.bzrignore @@ -698,6 +698,8 @@ ndb/examples/ndbapi_example2/ndbapi_example2 ndb/examples/ndbapi_example3/ndbapi_example3 ndb/examples/ndbapi_example5/ndbapi_example5 ndb/examples/select_all/select_all +ndb/include/ndb_global.h +ndb/include/ndb_version.h ndb/lib/libMGM_API.so ndb/lib/libNDB_API.so ndb/lib/libNDB_ODBC.so |