diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
| commit | b0efe477fbec37c273098bc85263b195544f2edc (patch) | |
| tree | c54f50741a391458499e36ae02a2103f5717f07e /.bzrignore | |
| parent | fb2c04a15f6bb4a837e312019e18f881d43bbdd8 (diff) | |
| parent | fa15fbf34738550527b6b102960b7d9750fd959d (diff) | |
| download | mariadb-git-b0efe477fbec37c273098bc85263b195544f2edc.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1
into xiphis.org:/home/antony/work2/wl3201-post-review.2
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index afd29afbae2..095c04b36ee 100644 --- a/.bzrignore +++ b/.bzrignore @@ -322,6 +322,7 @@ cmd-line-utils/libedit/makelist comon.h comp_err/*.ds? comp_err/*.vcproj +compile config.cache config.guess config.h @@ -553,6 +554,7 @@ libmysqld/spatial.cc libmysqld/sql_acl.cc libmysqld/sql_analyse.cc libmysqld/sql_base.cc +libmysqld/sql_builtin.cc libmysqld/sql_cache.cc libmysqld/sql_class.cc libmysqld/sql_command @@ -1179,6 +1181,7 @@ sql/share/gmon.out sql/share/mysql sql/share/norwegian-ny/errmsg.sys sql/share/norwegian/errmsg.sys +sql/sql_builtin.cc sql/sql_select.cc.orig sql/sql_yacc.cc sql/sql_yacc.h |