summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorholyfoot/hf@hfmain.(none) <>2007-11-20 14:35:49 +0400
committerholyfoot/hf@hfmain.(none) <>2007-11-20 14:35:49 +0400
commit7435683dbf898b2340c04f7d3c4a7415bfb25e26 (patch)
treefba8a7e0fedb621fad497f7bf24ba21553d01dbc /.bzrignore
parent4051d1cda219bcdbd79330774559c303772a32bf (diff)
parent18f832a7084d357fb2fd4c4482129ee14f0c9e7f (diff)
downloadmariadb-git-7435683dbf898b2340c04f7d3c4a7415bfb25e26.tar.gz
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/31868/my51-31868
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 7a8066fdba1..d30466a0a36 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1137,6 +1137,7 @@ libmysqld/rpl_filter.cc
libmysqld/rpl_injector.cc
libmysqld/rpl_record.cc
libmysqld/rpl_record_old.cc
+libmysqld/scheduler.cc
libmysqld/set_var.cc
libmysqld/simple-test
libmysqld/slave.cc
@@ -1153,6 +1154,7 @@ libmysqld/sql_builtin.cc
libmysqld/sql_cache.cc
libmysqld/sql_class.cc
libmysqld/sql_command
+libmysqld/sql_connect.cc
libmysqld/sql_crypt.cc
libmysqld/sql_cursor.cc
libmysqld/sql_cursor.h
@@ -1183,6 +1185,7 @@ libmysqld/sql_show.cc
libmysqld/sql_state.c
libmysqld/sql_string.cc
libmysqld/sql_table.cc
+libmysqld/sql_tablespace.cc
libmysqld/sql_test.cc
libmysqld/sql_trigger.cc
libmysqld/sql_udf.cc