summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-02-17 17:07:14 +0100
committerserg@serg.mylan <>2004-02-17 17:07:14 +0100
commit6af8a9305213299f0150848c1686aaf49934ace7 (patch)
tree6ebf0969524ee8c2567a33c286ae057b66a556ae /.bzrignore
parent0c68e806097842e96439824977349f5ee4ec74fa (diff)
parentb8e161be4b6758ed89c46a639c08e1dc5debd9f0 (diff)
downloadmariadb-git-6af8a9305213299f0150848c1686aaf49934ace7.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index b8fac778709..0b5bb0bc33e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -361,6 +361,7 @@ libmysqld/item_func.cc
libmysqld/item_geofunc.cc
libmysqld/item_row.cc
libmysqld/item_strfunc.cc
+libmysqld/item_subselect.cc
libmysqld/item_sum.cc
libmysqld/item_timefunc.cc
libmysqld/item_uniq.cc
@@ -396,6 +397,7 @@ libmysqld/sql_command
libmysqld/sql_crypt.cc
libmysqld/sql_db.cc
libmysqld/sql_delete.cc
+libmysqld/sql_derived.cc
libmysqld/sql_do.cc
libmysqld/sql_handler.cc
libmysqld/sql_help.cc