diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
| commit | c9dbb4b72640ecfc063f06f9373ac42ef3d9775f (patch) | |
| tree | 68a7e089d65a9c4434527dfc1e58ba2f98a15a88 /.bzrignore | |
| parent | d7c5327db62886135dcb14ba1d9d117eaeaf6100 (diff) | |
| parent | 23d5f3f96546ce146c0986c53b114761b56a8650 (diff) | |
| download | mariadb-git-c9dbb4b72640ecfc063f06f9373ac42ef3d9775f.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
Auto merged
client/mysqlbinlog.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql-bench/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Docs/manual.texi:
merge
include/mysql_com.h:
merge
include/mysqld_error.h:
merge
mysql-test/install_test_db.sh:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/share/czech/errmsg.txt:
merge
sql/share/danish/errmsg.txt:
merge
sql/share/dutch/errmsg.txt:
merge
sql/share/english/errmsg.txt:
merge
sql/share/estonian/errmsg.txt:
merge
sql/share/french/errmsg.txt:
merge
sql/share/german/errmsg.txt:
merge
sql/share/greek/errmsg.txt:
merge
sql/share/hungarian/errmsg.txt:
merge
sql/share/italian/errmsg.txt:
merge
sql/share/japanese/errmsg.txt:
merge
sql/share/korean/errmsg.txt:
merge
sql/share/norwegian-ny/errmsg.txt:
merge
sql/share/norwegian/errmsg.txt:
merge
sql/share/polish/errmsg.txt:
merge
sql/share/portuguese/errmsg.txt:
merge
sql/share/romanian/errmsg.txt:
merge
sql/share/russian/errmsg.txt:
merge
sql/share/slovak/errmsg.txt:
merge
sql/share/spanish/errmsg.txt:
merge
sql/share/swedish/errmsg.txt:
merge
sql/sql_base.cc:
merge
sql/sql_table.cc:
merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index c2d82b8a418..5b2bbbfb929 100644 --- a/.bzrignore +++ b/.bzrignore @@ -8,6 +8,8 @@ *.lo *.o *.spec +*/*_pure_*warnings +*/.pure *~ .*.swp .deps @@ -121,6 +123,7 @@ bdb/include/gen_server_ext.h bdb/include/hash_auto.h bdb/include/log_auto.h bdb/include/qam_auto.h +bdb/include/rpc_client_ext.h bdb/include/rpc_server_ext.h bdb/include/txn_auto.h bdb/java/src/com/sleepycat/db/DbConstants.java @@ -175,6 +178,7 @@ heap/hp_test2 include/my_config.h include/my_global.h include/mysql_version.h +include/widec.h innobase/ib_config.h innobase/ib_config.h.in isam/isamchk |