summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-12-28 00:15:29 +0100
committerunknown <serg@janus.mylan>2007-12-28 00:15:29 +0100
commit4140f76f4e50a0497c8d325fef7e255bb5cf4e68 (patch)
treead7653284333477b8b2d0bcb4d2582cbbcb0e47e /.bzrignore
parent7fdbc4230e68171e17e0dd4f6ae2d3fe3acb7549 (diff)
downloadmariadb-git-4140f76f4e50a0497c8d325fef7e255bb5cf4e68.tar.gz
after merge
include/mysql/plugin.h: move declarations after merge mysql-test/r/change_user.result: more tests mysql-test/t/change_user.test: more tests mysys/my_getopt.c: remove wrong code BitKeeper/etc/ignore: Added libmysqld/sql_profile.cc to the ignore list
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index fcafdf8915a..872ea62058e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3066,3 +3066,4 @@ win/vs8cache.txt
ylwrap
zlib/*.ds?
zlib/*.vcproj
+libmysqld/sql_profile.cc