diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-05 03:52:53 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-05 03:52:53 +0200 |
| commit | 5fdd9f878f3b4690e3f6f0710e5930a81fcd368a (patch) | |
| tree | 2959d46dd791f0698cbce4b4f3827956753e60bd /.bzrignore | |
| parent | 591b058518dcbc736398d64e8bfd1ac43099323e (diff) | |
| parent | 491415cd0365f544d9199e96db34f30e58bed6ba (diff) | |
| download | mariadb-git-5fdd9f878f3b4690e3f6f0710e5930a81fcd368a.tar.gz | |
Merge with 3.23
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
libmysql/password.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_static.c:
Auto merged
mysys/my_static.h:
Auto merged
mysys/my_tempnam.c:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
mysql-test/t/temp_table.test:
Added comment
sql/mysqld.cc:
Don't apply change from 3.23
sql/sql_show.cc:
Don't apply change from 3.23
sql/structs.h:
Don't apply change from 3.23
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.bzrignore b/.bzrignore index 0996f3b057b..70ecba34c3a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -73,6 +73,9 @@ Makefile.in' PENDING/* TAGS aclocal.m4 +autom4te-2.53.cache/output.0 +autom4te-2.53.cache/requests +autom4te-2.53.cache/traces.0 autom4te.cache/* autom4te.cache/output.0 autom4te.cache/requests @@ -114,6 +117,9 @@ bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c +bdb/dist/autom4te-2.53.cache/output.0 +bdb/dist/autom4te-2.53.cache/requests +bdb/dist/autom4te-2.53.cache/traces.0 bdb/dist/autom4te.cache/* bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests @@ -173,6 +179,8 @@ bdb/test/include.tcl bdb/test/logtrack.list bdb/txn/txn_auto.c binary/* +bkpull.log +build.log client/insert_test client/log_event.cc client/log_event.h @@ -199,6 +207,7 @@ config.log config.status configure core +core.2430 db-*.*.* dbug/user.t depcomp @@ -216,6 +225,9 @@ include/my_config.h include/my_global.h include/mysql_version.h include/widec.h +innobase/autom4te-2.53.cache/output.0 +innobase/autom4te-2.53.cache/requests +innobase/autom4te-2.53.cache/traces.0 innobase/autom4te.cache/* innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests @@ -406,6 +418,7 @@ mysys/test_thr_alarm mysys/test_thr_lock mysys/test_vsnprintf mysys/testhash +pull.log regex/re repl-tests/test-repl-ts/repl-timestamp.master.reject repl-tests/test-repl/foo-dump-slave.master. @@ -509,16 +522,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -autom4te-2.53.cache/output.0 -autom4te-2.53.cache/requests -autom4te-2.53.cache/traces.0 -bdb/dist/autom4te-2.53.cache/output.0 -bdb/dist/autom4te-2.53.cache/requests -bdb/dist/autom4te-2.53.cache/traces.0 -bkpull.log -build.log -innobase/autom4te-2.53.cache/output.0 -innobase/autom4te-2.53.cache/requests -innobase/autom4te-2.53.cache/traces.0 -pull.log -core.2430 |