summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-03-26 15:06:05 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-03-26 15:06:05 +0200
commit2ec108107db299b3984a06746388798acbd95b0b (patch)
treef9a11c1a04e8ec893c0d1b6512219306a0f965d8 /.bzrignore
parentc9ba7c5f21582136747219c0f95be9a1f7b819ee (diff)
downloadmariadb-git-2ec108107db299b3984a06746388798acbd95b0b.tar.gz
Derived tables !
mysql-test/r/union.result: small bug fixes in unions BitKeeper/etc/ignore: Added Docs/manual.texi.orig Docs/manual.texi.rej to the ignore list mysql-test/t/union.test: test for a bug fix in union's sql/sql_union.cc: bug fix for unions
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index f2da28f44f8..cfd2ca463cc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -466,3 +466,5 @@ vio/viotest-ssl
libmysqld/gstream.cc
libmysqld/spatial.cc
sql/sql_yacc.yy.orig
+Docs/manual.texi.orig
+Docs/manual.texi.rej