diff options
| author | unknown <andrey@lmy004.> | 2006-07-10 14:42:29 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-07-10 14:42:29 +0200 |
| commit | 5d91dc2560836ae28351baf446df7bee97e2cd05 (patch) | |
| tree | 28a786dfaf77132889807ad9f7ff5dbd568f9707 /.bzrignore | |
| parent | e8699b56140571305b898c29bdc45a5bab117a45 (diff) | |
| parent | 974eecc246db18e29e5ef06db6f48a0f4b3f7951 (diff) | |
| download | mariadb-git-5d91dc2560836ae28351baf446df7bee97e2cd05.tar.gz | |
Manual merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/events_logs_tests.result:
Auto merged
mysql-test/t/events_logs_tests.test:
Auto merged
mysql-test/t/events_stress.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/event_data_objects.cc:
manual merge
sql/events.cc:
manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
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 |