diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-09-06 19:15:31 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-09-06 19:15:31 +0500 |
| commit | 414d345071297b8a377a9643c3a20ab576d61e2f (patch) | |
| tree | bbd6d8c264f52e951930024d8102a0973711582c /.bzrignore | |
| parent | a3dc9569e983db92ca1ace1f3fe66428cd8098e2 (diff) | |
| parent | 403ed43b1d338e7e7b845546178cac2e3334e1e2 (diff) | |
| download | mariadb-git-414d345071297b8a377a9643c3a20ab576d61e2f.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
BitKeeper/etc/ignore:
auto-union
mysql-test/r/distinct.result:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/include/mix1.inc:
Merge with 5.0-opt.
mysql-test/r/group_by.result:
Merge with 5.0-opt.
mysql-test/r/innodb_mysql.result:
Merge with 5.0-opt.
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/t/group_by.test:
Merge with 5.0-opt.
mysql-test/t/sp.test:
Merge with 5.0-opt.
sql/sql_parse.cc:
Merge with 5.0-opt.
sql/sql_select.cc:
Merge with 5.0-opt.
sql/sql_view.cc:
Merge with 5.0-opt.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index c38cb22d0fd..e1ad5a89015 100644 --- a/.bzrignore +++ b/.bzrignore @@ -476,6 +476,9 @@ contrib/*.vcproj core core.* core.2430 +cscope.in.out +cscope.out +cscope.po.out db-*.*.* dbug/*.ds? dbug/*.vcproj |