summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorandrey@lmy004. <>2006-07-10 14:42:29 +0200
committerandrey@lmy004. <>2006-07-10 14:42:29 +0200
commit2319aac01e7c3cf0037b454df4207a9a198baf54 (patch)
tree28a786dfaf77132889807ad9f7ff5dbd568f9707 /.bzrignore
parentc15805f741b41806c37bb217e84136b8c2debfd9 (diff)
parente3d0524bbd79f85d166e7ec369d6a1f612a8c3d1 (diff)
downloadmariadb-git-2319aac01e7c3cf0037b454df4207a9a198baf54.tar.gz
Manual merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 2fdd5b3e68f..3cb00e96541 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -444,6 +444,7 @@ libmysql/mysys_priv.h
libmysql/net.c
libmysql/release/libmysql.exp
libmysql/vio_priv.h
+libmysql/viosocket.o.6WmSJk
libmysql_r/*.c
libmysql_r/acconfig.h
libmysql_r/conf_to_src
@@ -461,7 +462,10 @@ libmysqld/discover.cc
libmysqld/emb_qcache.cpp
libmysqld/errmsg.c
libmysqld/event.cc
+libmysqld/event_data_objects.cc
+libmysqld/event_db_repository.cc
libmysqld/event_executor.cc
+libmysqld/event_queue.cc
libmysqld/event_scheduler.cc
libmysqld/event_timed.cc
libmysqld/events.cc