summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-11-05 13:20:35 +0200
committermonty@mysql.com <>2005-11-05 13:20:35 +0200
commitcdf64f0f5724077d58158ecc8894cfff85dbc9c0 (patch)
tree460c9bc04fe66682e1873d2b1e848a224ae7eb8d /.bzrignore
parenta6f5375cb0cb40055f52e92d20ca04233ce70386 (diff)
downloadmariadb-git-cdf64f0f5724077d58158ecc8894cfff85dbc9c0.tar.gz
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 7294be6cb60..d170e7f9027 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1537,3 +1537,4 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
+libmysqld/sql_plugin.cc