diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:58:57 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:58:57 -0500 |
| commit | 5a0b54fd13e413eee1fbe2fc9176330d2daeb6fa (patch) | |
| tree | 8000ea4cede29d098cc2e485d08d1f337ec4fa9f /.bzrignore | |
| parent | f3c26f7d9c180fb2b220ee7a11a7419ada2a06bf (diff) | |
| parent | 89220d074773ce768c044ba6042c9bebe7935acb (diff) | |
| download | mariadb-git-5a0b54fd13e413eee1fbe2fc9176330d2daeb6fa.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
sql/item_func.h:
Auto merged
mysql-test/r/mysql.result:
Manual merge
mysql-test/t/mysql.test:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e167619c1a6..a8e964fd0c3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -334,6 +334,7 @@ client/sql_string.cpp client/ssl_test client/thimble client/thread_test +client/tmp.diff client_debug/* client_release/* client_test @@ -762,10 +763,12 @@ mysql-test/r/rpl000016.eval mysql-test/r/rpl_log.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval +mysql-test/r/tmp.result mysql-test/r/udf.log mysql-test/share/mysql mysql-test/std_data/*.pem mysql-test/t/index_merge.load +mysql-test/t/tmp.test mysql-test/var mysql-test/var/* mysql.kdevprj |