summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-02 20:58:45 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-02 20:58:45 +0300
commite415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch)
treef113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /.bzrignore
parent046418ad956c98c3788d79650fcb50479844df3b (diff)
parenta1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff)
downloadmariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore23
1 files changed, 18 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore
index e1f1490d191..b2dd8a9447c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -10,6 +10,7 @@
*.core
*.d
*.da
+*.dir
*.dll
*.exe
*.exp
@@ -31,6 +32,7 @@
*.pdb
*.reject
*.res
+*.rule
*.sbr
*.so
*.so.*
@@ -41,15 +43,21 @@
*.dsp
*.Po
*.Plo
-*.dir/
+*.vcxproj
+*.vcxproj.filters
+*/*.dir/*
+*.dir
+Debug
+MySql.sdf
+Win32
*/*_pure_*warnings
*/.deps
*/.libs/*
*/.pure
-debug/
-MinSizeRel/
-Release/
-RelWithDebInfo/
+*/debug/*
+*/minsizerel/*
+*/release/*
+RelWithDebInfo
*~
.*.swp
./CMakeCache.txt
@@ -429,6 +437,7 @@ include/mysql_h.ic
include/mysql_version.h
include/mysqld_ername.h
include/mysqld_error.h
+include/mysqld_error.h.rule
include/openssl
include/readline
include/readline/*.h
@@ -1154,7 +1163,9 @@ scripts/mysql_find_rows
scripts/mysql_fix_extensions
scripts/mysql_fix_privilege_tables
scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables.sql.rule
scripts/mysql_fix_privilege_tables_sql.c
+scripts/mysql_fix_privilege_tables_sql.c.rule
scripts/mysql_install_db
scripts/mysql_secure_installation
scripts/mysql_setpermission
@@ -1239,6 +1250,7 @@ sql/handlerton.cc
sql/html
sql/latex
sql/lex_hash.h
+sql/lex_hash.h.rule
sql/link_sources
sql/max/*
sql/message.h
@@ -1290,6 +1302,7 @@ sql/sql_builtin.cc
sql/sql_select.cc.orig
sql/sql_yacc.cc
sql/sql_yacc.h
+sql/sql_yacc.h.rule
sql/sql_yacc.output
sql/sql_yacc.yy.orig
sql/test_time