diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-12 16:11:43 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-12 16:11:43 +0300 |
| commit | 89b28ebdeb8c646580672b9d7e18d8b26576c0c8 (patch) | |
| tree | c5887f08e93e4230ad43272f74fceef0bd0e36db /.bzrignore | |
| parent | 2aed7cf90ef69ad58588cd8296176bad20b9dd04 (diff) | |
| parent | 02e0db5a51c8218ce1cb2ecd29d1001d92e914a7 (diff) | |
| download | mariadb-git-89b28ebdeb8c646580672b9d7e18d8b26576c0c8.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
BitKeeper/etc/ignore:
auto-union
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
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 5b2bbbfb929..64c67aba176 100644 --- a/.bzrignore +++ b/.bzrignore @@ -179,6 +179,8 @@ include/my_config.h include/my_global.h include/mysql_version.h include/widec.h +innobase/conftest.s1 +innobase/conftest.subs innobase/ib_config.h innobase/ib_config.h.in isam/isamchk @@ -366,6 +368,7 @@ sql/share/gmon.out sql/share/mysql sql/share/norwegian-ny/errmsg.sys sql/share/norwegian/errmsg.sys +sql/sql_select.cc.orig sql/sql_yacc.cc sql/sql_yacc.h stamp-h |