summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <ian@zim.(none)>2006-03-27 17:45:06 -0800
committerunknown <ian@zim.(none)>2006-03-27 17:45:06 -0800
commitaf64d85ab9cf99299c4990db46cdc2201baa4336 (patch)
tree5b3e7270fa0279b2e7c2b7695fc1729a0be341a5 /.bzrignore
parentab123657b27c575b762f4406417f10d01c3365f9 (diff)
downloadmariadb-git-af64d85ab9cf99299c4990db46cdc2201baa4336.tar.gz
Fix for bug #16855
BitKeeper/etc/ignore: Added mysql-test/r/bdb.log mysql-test/r/im_client_port.log to the ignore list client/mysql.cc: If --socket is not set, provides --protocol=TCP when --port= is specified (and --protocol= is not specified.)
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index e521692f6c2..f42630ae0ec 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1275,3 +1275,5 @@ zlib/*.ds?
zlib/*.vcproj
scripts/mysql_upgrade
include/openssl
+mysql-test/r/bdb.log
+mysql-test/r/im_client_port.log