diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-09 15:01:02 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-09 15:01:02 +0200 |
| commit | 85e02d693c10553fd15c1193865a7e6996545838 (patch) | |
| tree | 3065e2b92039e911c2fc142749b31c47d64db7cd /.bzrignore | |
| parent | 2204fbea330b5877a104d64a62f2fa6535833fce (diff) | |
| parent | ade101ca2bf132b5eb065ef74aa574c01e202074 (diff) | |
| download | mariadb-git-85e02d693c10553fd15c1193865a7e6996545838.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
mysql-test/r/join.result:
Auto merged
mysql-test/t/join.test:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore index bfb1710d33d..415aba16441 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 @@ -326,6 +340,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,13 +417,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 |