diff options
author | unknown <serg@serg.mysql.com> | 2001-10-09 16:01:06 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-09 16:01:06 +0200 |
commit | a0ed9744f3d12e16e0fa5e784a37f21d7a1d2faf (patch) | |
tree | bace3e172eb9211454c99657fb4493bb3159d503 /.bzrignore | |
parent | 93cc6444ccad2ace36ba354cd96ffe8ede676761 (diff) | |
parent | 85e02d693c10553fd15c1193865a7e6996545838 (diff) | |
download | mariadb-git-a0ed9744f3d12e16e0fa5e784a37f21d7a1d2faf.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
the file is deleted anyway
include/my_global.h:
merder
myisam/ft_boolean_search.c:
huh?
mysql-test/r/fulltext.result:
use local
mysql-test/r/fulltext_cache.result:
ur
mysql-test/r/fulltext_left_join.result:
ur
mysql-test/r/fulltext_multi.result:
ur
mysql-test/r/fulltext_order_by.result:
ur
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/.bzrignore b/.bzrignore index 492a91ee534..0e2ef25bf2e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -7,6 +7,7 @@ *.la *.lo *.o +*.reject *.spec */*_pure_*warnings */.pure @@ -152,6 +153,8 @@ client/mysqlbinlog client/mysqlcheck client/mysqldump client/mysqlimport +client/mysqlmanager-pwgen +client/mysqlmanagerc client/mysqlshow client/mysqltest client/mysys_priv.h @@ -203,6 +206,17 @@ libmysqld/backup_dir libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c +libmysqld/examples/completion_hash.cc +libmysqld/examples/completion_hash.h +libmysqld/examples/my_readline.h +libmysqld/examples/mysql +libmysqld/examples/mysql.cc +libmysqld/examples/mysqltest +libmysqld/examples/mysqltest.c +libmysqld/examples/readline.cc +libmysqld/examples/sql_string.cc +libmysqld/examples/sql_string.h +libmysqld/examples/test-gdbinit libmysqld/field.cc libmysqld/field_conv.cc libmysqld/filesort.cc @@ -288,6 +302,8 @@ linked_libmysqldex_sources linked_server_sources linked_tools_sources locked +myisam/FT1.MYD +myisam/FT1.MYI myisam/ft_dump myisam/ft_eval myisam/ft_test1 @@ -326,6 +342,7 @@ scripts/make_binary_distribution scripts/msql2mysql scripts/mysql_config scripts/mysql_convert_table_format +scripts/mysql_explain_log scripts/mysql_find_rows scripts/mysql_fix_privilege_tables scripts/mysql_install_db @@ -402,15 +419,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/examples/completion_hash.cc -libmysqld/examples/completion_hash.h -libmysqld/examples/my_readline.h -libmysqld/examples/mysql.cc -libmysqld/examples/mysqltest.c -libmysqld/examples/readline.cc -libmysqld/examples/sql_string.cc -libmysqld/examples/sql_string.h -libmysqld/examples/mysql -libmysqld/examples/mysqltest -myisam/FT1.MYD -myisam/FT1.MYI |