diff options
| author | unknown <andrey@lmy004.> | 2006-06-20 17:14:36 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-06-20 17:14:36 +0200 |
| commit | d898972dc034176e4a6f4334bf3a6c1a6827f9c3 (patch) | |
| tree | fd0c09b50a9465f331eb5366fb20cc7888a4a8eb /.bzrignore | |
| parent | 40a614ed5a45674c6dd5d259a7a977cc72b4b113 (diff) | |
| parent | 7daf362e2436cc3a300c47d33fcb43e00774f3a8 (diff) | |
| download | mariadb-git-d898972dc034176e4a6f4334bf3a6c1a6827f9c3.tar.gz | |
manual merge
BitKeeper/etc/ignore:
auto-union
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/events.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 25056b86642..e07aa0cf86a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -462,6 +462,7 @@ libmysqld/event.cc libmysqld/event_executor.cc libmysqld/event_scheduler.cc libmysqld/event_timed.cc +libmysqld/events.cc libmysqld/examples/client_test.c libmysqld/examples/client_test.cc libmysqld/examples/completion_hash.cc |