summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-07-23 22:08:37 +0300
committerunknown <monty@mashka.mysql.fi>2002-07-23 22:08:37 +0300
commit80db4ec7346d505873ca68441f3a51b08d420b60 (patch)
treeebea9cb72887358656e77b4e82bb91a3c7767a81 /.bzrignore
parent10bd14dee8488b59798e9b24db1c50759e9242ae (diff)
downloadmariadb-git-80db4ec7346d505873ca68441f3a51b08d420b60.tar.gz
Small fixes after merge
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: This file is not auto-created BitKeeper/etc/ignore: Added libmysqld/sql_olap.cc myisam/myisam.log to the ignore list Docs/manual.texi: Small fixes sql/sql_lex.h: Fixed typo
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 4c1775db904..811cd82d56c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -481,3 +481,5 @@ mit-pthreads/pg++
mit-pthreads/pgcc
scripts/mysql_tableinfo
libmysql/net.c
+libmysqld/sql_olap.cc
+myisam/myisam.log