Commit 1da341fc authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql-4.0

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents 24bcdaaf f6836bf8
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -138,13 +138,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
@@ -254,6 +260,7 @@ libmysqld/sql_string.cc
libmysqld/sql_table.cc
libmysqld/sql_test.cc
libmysqld/sql_udf.cc
libmysqld/sql_union.cc
libmysqld/sql_unions.cc
libmysqld/sql_update.cc
libmysqld/sql_yacc.cc
@@ -290,6 +297,7 @@ mysql-test/r/*.reject
mysql-test/r/rpl_log.eval
mysql-test/share/mysql
mysql-test/var/*
mysql.kdevprj
mysql.proj
mysqld.S
mysqld.sym
@@ -376,4 +384,3 @@ support-files/mysql.spec
tags
tmp/*
vio/viotest-ssl
libmysqld/sql_union.cc
+0 −0

Empty file added.

+133 B
Loading image diff...
+0 −0

Empty file added.

+0 −0

Empty file added.

Loading