summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2006-02-17 10:02:59 -0800
committerunknown <jimw@mysql.com>2006-02-17 10:02:59 -0800
commiteae6679fd4a55a1798f2c20385507f869c85e7a6 (patch)
tree4e28662ff02f85eb8017723e5fb8f2691fbda056 /.bzrignore
parentdd6e56b903afc978bb0b3273727cb59c23786b1b (diff)
downloadmariadb-git-eae6679fd4a55a1798f2c20385507f869c85e7a6.tar.gz
Fix subselect results (there was a bad merge when subselect test was disabled)
BitKeeper/etc/ignore: Added scripts/mysql_upgrade to the ignore list mysql-test/r/subselect.result: Update results
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index a210762d46a..a16ed70a812 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1273,3 +1273,4 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
+scripts/mysql_upgrade