diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-03 11:35:58 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-03 11:35:58 -0400 |
| commit | 058cad784851301664b8b3e26cad93093b446357 (patch) | |
| tree | 26ea19d61c67c7cded9c9c925281f64ddf51bc14 /.bzrignore | |
| parent | 9baac37a621a48602c02f8e4516143d0cbed9d65 (diff) | |
| parent | 90ff8fbd380154b6b1efef259d326185277f007a (diff) | |
| download | mariadb-git-058cad784851301664b8b3e26cad93093b446357.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/func_time.result:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/t/func_time.test:
manual merge
mysql-test/t/mysqldump.test:
manual merge
sql/log.cc:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_table.cc:
manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index d570c36c7f5..2fdd5b3e68f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1120,6 +1120,7 @@ server-tools/instance-manager/messages.cpp server-tools/instance-manager/mysql_connection.cpp server-tools/instance-manager/mysqlmanager server-tools/instance-manager/mysqlmanager.cpp +server-tools/instance-manager/net_serv.cc server-tools/instance-manager/options.cpp server-tools/instance-manager/parse.cpp server-tools/instance-manager/parse_output.cpp @@ -1780,4 +1781,3 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj -server-tools/instance-manager/net_serv.cc |