summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-15 12:25:44 +0200
committerunknown <serg@serg.mylan>2003-10-15 12:25:44 +0200
commitb192ab5edc45bf221f99ed53ce4d975160d830fa (patch)
tree39df3a873ccd4aba6541c6659c5508843742f8be /.bzrignore
parent9456073f90354e82c8b31335bac1d486c88f2f4a (diff)
parentbbfa68d10202df2bf6bc8193d3355fb22f31cff7 (diff)
downloadmariadb-git-b192ab5edc45bf221f99ed53ce4d975160d830fa.tar.gz
merged
BitKeeper/etc/ignore: auto-union myisam/myisamdef.h: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_test.cc: Auto merged sql/table.cc: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 3dc7f26cfbe..339dc8f33ee 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -590,6 +590,7 @@ sql/sql_yacc.cc
sql/sql_yacc.h
sql/sql_yacc.output
sql/sql_yacc.yy.orig
+sql/udf_example.so
sql_error.cc
sql_prepare.cc
stamp-h