diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
| commit | f7b98c25f4569a04d2a6ad1cb294601b3d1bb658 (patch) | |
| tree | fa51d3c04c53ac900a866138d59e1b6796fe2d52 /.bzrignore | |
| parent | 1d75aeb9a9175e3444594aea65e2a3760ce64baf (diff) | |
| parent | b3d86f12ebfbdd7cd053003ebe7657df66a07d45 (diff) | |
| download | mariadb-git-f7b98c25f4569a04d2a6ad1cb294601b3d1bb658.tar.gz | |
Manual merge from 5.1
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 45cd7f2dc78..05597220950 100644 --- a/.bzrignore +++ b/.bzrignore @@ -43,6 +43,10 @@ *.vcxproj *.vcxproj.filters */*.dir/* +*.dir +Debug +MySql.sdf +Win32 */*_pure_*warnings */.deps */.libs/* @@ -615,6 +619,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/probes_mysql_dtrace.h include/readline @@ -1897,7 +1902,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 @@ -2137,6 +2144,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 @@ -2168,6 +2176,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 |