diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:46:48 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:46:48 -0500 |
| commit | b022aef7cb03284d7a66e9da78e6259f53281ab9 (patch) | |
| tree | 8675dc7902c72d482e2d0e3bfa01a9335bcbb6f9 /.bzrignore | |
| parent | 77be0c92a8725f277a42e3b875b9a82288f1b9f5 (diff) | |
| parent | 89220d074773ce768c044ba6042c9bebe7935acb (diff) | |
| download | mariadb-git-b022aef7cb03284d7a66e9da78e6259f53281ab9.tar.gz | |
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Manually merged
mysql-test/t/mysql.test:
Manually merged
sql/item_func.h:
Manually merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 9c9121c5dc5..8f976b6b640 100644 --- a/.bzrignore +++ b/.bzrignore @@ -379,6 +379,7 @@ client/sql_string.cpp client/ssl_test client/thimble client/thread_test +client/tmp.diff client_debug/* client_release/* client_test @@ -1324,10 +1325,12 @@ mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval mysql-test/r/symlink.log mysql-test/r/system_mysql_db.log +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 |