diff options
| author | unknown <serg@serg.mylan> | 2004-11-20 18:36:41 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-20 18:36:41 +0100 |
| commit | 7b0069ee20c5f0a43149aa962ac1b26f19257b23 (patch) | |
| tree | 62ae289d237eebb2f3c921cb532cc66e70229341 /.bzrignore | |
| parent | 15092975f506dfadeb379805f78e50e2939a2911 (diff) | |
| parent | a3740c887e940144828543bc7c4e1ddfa8de2b7e (diff) | |
| download | mariadb-git-7b0069ee20c5f0a43149aa962ac1b26f19257b23.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/Makefile.am:
Auto merged
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
include/my_time.h:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index d704da6261d..2893e947cf8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -102,6 +102,7 @@ Makefile.in Makefile.in' PENDING/* TAGS +ac_available_languages_fragment aclocal.m4 autom4te-2.53.cache/* autom4te-2.53.cache/output.0 @@ -315,6 +316,7 @@ gmon.out hardcopy.0 heap/hp_test1 heap/hp_test2 +help help.c help.h include/my_config.h @@ -756,11 +758,25 @@ ndb/tools/ndb_delete_all ndb/tools/ndb_desc ndb/tools/ndb_drop_index ndb/tools/ndb_drop_table +ndb/tools/ndb_restore ndb/tools/ndb_select_all ndb/tools/ndb_select_count ndb/tools/ndb_show_tables ndb/tools/ndb_test_platform ndb/tools/ndb_waiter +ndbcluster-1186 +ndbcluster-1186/SCCS +ndbcluster-1186/config.ini +ndbcluster-1186/ndb_1.pid +ndbcluster-1186/ndb_1_out.log +ndbcluster-1186/ndb_1_signal.log +ndbcluster-1186/ndb_2.pid +ndbcluster-1186/ndb_2_out.log +ndbcluster-1186/ndb_2_signal.log +ndbcluster-1186/ndb_3.pid +ndbcluster-1186/ndb_3_cluster.log +ndbcluster-1186/ndb_3_out.log +ndbcluster-1186/ndbcluster.pid pull.log regex/re repl-tests/test-repl-ts/repl-timestamp.master.reject @@ -959,5 +975,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -ac_available_languages_fragment -ndb/tools/ndb_restore |