diff options
| author | unknown <nick@mysql.com> | 2002-10-30 23:58:52 -0700 |
|---|---|---|
| committer | unknown <nick@mysql.com> | 2002-10-30 23:58:52 -0700 |
| commit | 3cc1e1e6d76d9187bb115dff4bcb8911334578e5 (patch) | |
| tree | 46c494cc14a6364cb0e7f7c0cebbcf0887c5ba74 /.bzrignore | |
| parent | a273b1dc8f50e1bddb30faee399d93f071f996b8 (diff) | |
| parent | 39be9ea7ce9a440868d19930dabdd7294b6faac6 (diff) | |
| download | mariadb-git-3cc1e1e6d76d9187bb115dff4bcb8911334578e5.tar.gz | |
Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1
BitKeeper/etc/ignore:
auto-union
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.bzrignore b/.bzrignore index 0a6384dfccb..f26e041f3ba 100644 --- a/.bzrignore +++ b/.bzrignore @@ -75,6 +75,7 @@ Makefile.in' PENDING/* TAGS aclocal.m4 +autom4te.cache/* bdb/README bdb/btree/btree_auto.c bdb/build_unix/* @@ -192,6 +193,7 @@ config.h.in config.log config.status configure +configure.lineno core db-*.*.* dbug/user.t @@ -209,10 +211,13 @@ include/my_config.h include/my_global.h include/mysql_version.h include/widec.h +innobase/autom4te.cache/* +innobase/configure.lineno innobase/conftest.s1 innobase/conftest.subs innobase/ib_config.h innobase/ib_config.h.in +innobase/stamp-h1 isam/isamchk isam/isamlog isam/pack_isam @@ -302,6 +307,7 @@ libmysqld/sql_db.cc libmysqld/sql_delete.cc libmysqld/sql_do.cc libmysqld/sql_handler.cc +libmysqld/sql_help.cc libmysqld/sql_insert.cc libmysqld/sql_lex.cc libmysqld/sql_list.cc @@ -361,6 +367,8 @@ myisam/myisamchk myisam/myisamlog myisam/myisampack myisam/rt_test +myisam/rt_test.MYD +myisam/rt_test.MYI myisam/sp_test myisam/test1.MYD myisam/test1.MYI @@ -405,6 +413,8 @@ repl-tests/test-repl/foo-dump-slave.master. 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/fill_func_tables +scripts/fill_func_tables.sql scripts/make_binary_distribution scripts/msql2mysql scripts/mysql_config @@ -474,8 +484,11 @@ sql/sql_select.cc.orig sql/sql_yacc.cc sql/sql_yacc.h sql/sql_yacc.yy.orig +sql_error.cc +sql_prepare.cc stamp-h stamp-h.in +stamp-h1 strings/conf_to_src strings/ctype_autoconf.c strings/ctype_extra_sources.c @@ -503,15 +516,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -sql_error.cc -sql_prepare.cc -autom4te.cache/* -innobase/autom4te.cache/* -configure.lineno -innobase/configure.lineno -innobase/stamp-h1 -myisam/rt_test.MYD -myisam/rt_test.MYI -stamp-h1 -scripts/fill_func_tables -scripts/fill_func_tables.sql |