diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-08-03 17:15:23 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-08-03 17:15:23 +0200 |
| commit | d63ec0931de1c22f54e2e633442293799bf5cdf2 (patch) | |
| tree | 41392b6e41e1b68bd6aeb6fb0853704e5a98ce3a /.bzrignore | |
| parent | 705e7a748ec2e0126297627a2186dad08b637e16 (diff) | |
| parent | f338fd010a0a29e4c52c41b3ef4962f36be6a1d1 (diff) | |
| download | mariadb-git-d63ec0931de1c22f54e2e633442293799bf5cdf2.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-marvel
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/mysql.h:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_parse.cc:
merge fix
sql/sql_select.cc:
merge fix
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index d44aefea583..af4feb9a5b8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2882,6 +2882,7 @@ support-files/mysql-3.23.29-gamma.spec support-files/mysql-log-rotate support-files/mysql.server support-files/mysql.spec +support-files/mysqld_multi.server support-files/ndb-config-2-node.ini tags test/ndbapi/bank/bankCreator @@ -2947,6 +2948,7 @@ tests/.deps/thread_test.Po tests/.libs -prune tests/.libs/lt-mysql_client_test tests/.libs/mysql_client_test +tests/bug25714 tests/client_test tests/connect_test tests/mysql_client_test |