diff options
author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 18:00:50 +0200 |
---|---|---|
committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 18:00:50 +0200 |
commit | 002426a9eb535d6d0ed49253319ca16a9aa0a046 (patch) | |
tree | 76a883b33c5468cbe5db97eedc0e998437d95538 /.bzrignore | |
parent | bbfb9eabd52e15746b790ab0201bddc135001245 (diff) | |
parent | f6641998bec64b18abf75df94ff2dad8cd3ed603 (diff) | |
download | mariadb-git-002426a9eb535d6d0ed49253319ca16a9aa0a046.tar.gz |
merge
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 0d668308193..22b3a680db6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -42,6 +42,10 @@ *.vcxproj *.vcxproj.filters */*.dir/* +*.dir +Debug +MySql.sdf +Win32 */*_pure_*warnings */.deps */.libs/* @@ -611,6 +615,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 @@ -1883,7 +1888,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 @@ -2120,6 +2127,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 @@ -2151,6 +2159,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 |