diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-18 03:13:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-18 03:13:37 +0200 |
| commit | 76c8b9becec0438562882f591529190564a2d82f (patch) | |
| tree | b24bce166fd5affbcc506bbc7d70c2c7ef00f561 /.bzrignore | |
| parent | 0ee64eb3d2daccd29478832ef9ce86f0ea086e9d (diff) | |
| parent | aec8aeaab869e8553123ad1aefd8a5ab2c5f3ea7 (diff) | |
| download | mariadb-git-76c8b9becec0438562882f591529190564a2d82f.tar.gz | |
Merge with 4.0.9
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_unique.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/null.test:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
strings/Makefile.am:
Auto merged
libmysql/Makefile.shared:
merge
libmysql/libmysql.def:
merge
sql/ha_innodb.cc:
merge
sql/item_cmpfunc.cc:
merge
sql/log_event.cc:
merge
sql/sql_handler.cc:
merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 17fee4a6fc1..7d35c950ee3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -253,6 +253,7 @@ depcomp extra/comp_err extra/my_print_defaults extra/mysql_install +extra/mysql_waitpid extra/perror extra/replace extra/resolve_stack_dump @@ -350,6 +351,7 @@ libmysqld/opt_range.cc libmysqld/opt_sum.cc libmysqld/password.c libmysqld/procedure.cc +libmysqld/protocol.cc libmysqld/records.cc libmysqld/repl_failsafe.cc libmysqld/set_var.cc @@ -569,6 +571,7 @@ support-files/mysql-log-rotate support-files/mysql.server support-files/mysql.spec tags +test_xml tests/client_test tmp/* tools/my_vsnprintf.c @@ -579,6 +582,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/protocol.cc -test_xml -extra/mysql_waitpid |