mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union client/mysqlbinlog.cc: Auto merged
This commit is contained in:
commit
23d5f3f965
9 changed files with 70 additions and 34 deletions
|
|
@ -141,13 +141,19 @@ bdb/test/logtrack.list
|
|||
bdb/txn/txn_auto.c
|
||||
binary/*
|
||||
client/insert_test
|
||||
client/log_event.cc
|
||||
client/log_event.h
|
||||
client/mf_iocache.c
|
||||
client/mf_iocache.cc
|
||||
client/mysql
|
||||
client/mysqladmin
|
||||
client/mysqlbinlog
|
||||
client/mysqlcheck
|
||||
client/mysqldump
|
||||
client/mysqlimport
|
||||
client/mysqlshow
|
||||
client/mysqltest
|
||||
client/mysys_priv.h
|
||||
client/select_test
|
||||
client/thimble
|
||||
client/thread_test
|
||||
|
|
@ -214,6 +220,7 @@ mysql-test/mysql-test-run
|
|||
mysql-test/r/*.reject
|
||||
mysql-test/share/mysql
|
||||
mysql-test/var/*
|
||||
mysql.kdevprj
|
||||
mysql.proj
|
||||
mysqld.S
|
||||
mysqld.sym
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue