diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-01 11:06:28 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-01 11:06:28 -0600 |
| commit | 7f4df54136be14bbab1c893d8dc4ae2d41f88b65 (patch) | |
| tree | 339f91fcd691714e9ae0ce49d47b3765e09a021c /.bzrignore | |
| parent | 14cc2b78626b2c39cf34efa81c0289e5626e25f9 (diff) | |
| parent | 1a2b5bb0250b91e7e7d3f1e69abe15202ef7198a (diff) | |
| download | mariadb-git-7f4df54136be14bbab1c893d8dc4ae2d41f88b65.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index aef12b84ae0..716785b1665 100644 --- a/.bzrignore +++ b/.bzrignore @@ -119,6 +119,7 @@ bdb/include/gen_server_ext.h bdb/include/hash_auto.h bdb/include/log_auto.h bdb/include/qam_auto.h +bdb/include/rpc_server_ext.h bdb/include/txn_auto.h bdb/java/src/com/sleepycat/db/DbConstants.java bdb/log/log_auto.c @@ -183,6 +184,7 @@ libmysql_r/acconfig.h libmysql_r/conf_to_src libmysql_r/my_static.h libmysql_r/mysys_priv.h +libmysqld/backup_dir libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c @@ -222,12 +224,14 @@ libmysqld/opt_sum.cc libmysqld/password.c libmysqld/procedure.cc libmysqld/records.cc +libmysqld/simple-test libmysqld/slave.cc libmysqld/sql_acl.cc libmysqld/sql_analyse.cc libmysqld/sql_base.cc libmysqld/sql_cache.cc libmysqld/sql_class.cc +libmysqld/sql_command libmysqld/sql_crypt.cc libmysqld/sql_db.cc libmysqld/sql_delete.cc @@ -355,6 +359,3 @@ support-files/mysql.server support-files/mysql.spec tags tmp/* -libmysqld/sql_command -libmysqld/backup_dir -libmysqld/simple-test |