diff options
| author | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
| commit | 5db2d195a653d913b4b0adf741df79151ca2a5a6 (patch) | |
| tree | 7230fe81c62fa6a2bc488216ab3775d11795f3a5 /.bzrignore | |
| parent | 15b89bfc5981ad348220fbf3f7067b7465d71080 (diff) | |
| parent | b5819094a70fa1c4f9c231424af6792da0b7b801 (diff) | |
| download | mariadb-git-5db2d195a653d913b4b0adf741df79151ca2a5a6.tar.gz | |
merge 3.23 -> 4.0, 2003/02/06
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.bzrignore b/.bzrignore index 356418e3617..79a4d5b1ffd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -38,7 +38,11 @@ COPYING.LIB Docs/#manual.texi# Docs/INSTALL-BINARY Docs/include.texi +Docs/internals.html Docs/internals.info +Docs/internals.pdf +Docs/internals.txt +Docs/internals_toc.html Docs/manual.aux Docs/manual.cp Docs/manual.cps @@ -221,6 +225,7 @@ extra/replace extra/resolve_stack_dump extra/resolveip gmon.out +hardcopy.0 heap/hp_test1 heap/hp_test2 include/my_config.h @@ -251,11 +256,13 @@ libmysql/conf_to_src libmysql/my_static.h libmysql/mysys_priv.h libmysql/net.c +libmysql/vio_priv.h libmysql_r/*.c libmysql_r/acconfig.h libmysql_r/conf_to_src libmysql_r/my_static.h libmysql_r/mysys_priv.h +libmysql_r/vio_priv.h libmysqld/backup_dir libmysqld/convert.cc libmysqld/derror.cc @@ -363,6 +370,7 @@ linked_libmysqldex_sources linked_server_sources linked_tools_sources locked +man/*.1 mit-pthreads/config.flags mit-pthreads/include/bits mit-pthreads/include/pthread/machdep.h @@ -382,6 +390,7 @@ myisam/mi_test2 myisam/mi_test3 myisam/mi_test_all myisam/myisam.log +myisam/myisam_ftdump myisam/myisamchk myisam/myisamlog myisam/myisampack @@ -429,6 +438,8 @@ repl-tests/test-repl/sum-wlen-slave.master. repl-tests/test-repl/sum-wlen-slave.master.re repl-tests/test-repl/sum-wlen-slave.master.reje scripts/make_binary_distribution +scripts/make_sharedlib_distribution +scripts/make_win_src_distribution scripts/msql2mysql scripts/mysql_config scripts/mysql_convert_table_format @@ -496,6 +507,7 @@ sql/share/norwegian/errmsg.sys sql/sql_select.cc.orig sql/sql_yacc.cc sql/sql_yacc.h +sql/udf_example.so stamp-h stamp-h.in stamp-h1 @@ -504,6 +516,7 @@ strings/ctype_autoconf.c strings/ctype_extra_sources.c support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist +support-files/MacOSX/ReadMe.txt support-files/MacOSX/StartupParameters.plist support-files/MacOSX/postinstall support-files/MacOSX/preinstall @@ -530,16 +543,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -support-files/MacOSX/ReadMe.txt -Docs/internals.html -Docs/internals.pdf -Docs/internals.txt -Docs/internals_toc.html -scripts/make_win_src_distribution -libmysql/vio_priv.h -libmysql_r/vio_priv.h -hardcopy.0 -scripts/make_sharedlib_distribution -sql/udf_example.so -man/*.1 -myisam/myisam_ftdump |