summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-21 11:58:43 +0200
committerunknown <serg@serg.mylan>2003-10-21 11:58:43 +0200
commiteaf1b192a65477317d54438bb9b3c69de1370e2e (patch)
tree8d1d6d06c790efe700899d57a87e63e8d91764f4 /.bzrignore
parentc63e573399e53a23172a6a50fdcbe80c41da7d1d (diff)
parent3c2e50d772d0ed25dea73da277d84818dc151dd5 (diff)
downloadmariadb-git-eaf1b192a65477317d54438bb9b3c69de1370e2e.tar.gz
merged
BitKeeper/etc/ignore: auto-union include/m_ctype.h: Auto merged mysql-test/r/mysqldump.result: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.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/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged strings/ctype-simple.c: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 27f32040bc8..920522c7592 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -591,6 +591,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