Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

BitKeeper/etc/ignore:
  auto-union
This commit is contained in:
unknown 2001-09-19 02:14:27 +03:00
commit f350008707
2 changed files with 14 additions and 10 deletions

View file

@ -203,6 +203,16 @@ libmysqld/backup_dir
libmysqld/convert.cc
libmysqld/derror.cc
libmysqld/errmsg.c
libmysqld/examples/completion_hash.cc
libmysqld/examples/completion_hash.h
libmysqld/examples/my_readline.h
libmysqld/examples/mysql
libmysqld/examples/mysql.cc
libmysqld/examples/mysqltest
libmysqld/examples/mysqltest.c
libmysqld/examples/readline.cc
libmysqld/examples/sql_string.cc
libmysqld/examples/sql_string.h
libmysqld/field.cc
libmysqld/field_conv.cc
libmysqld/filesort.cc
@ -366,6 +376,9 @@ sql/lex_hash.h
sql/mini_client_errors.c
sql/mysqlbinlog
sql/mysqld
sql/mysqld-purecov
sql/mysqld-purify
sql/mysqld-quantify
sql/share/*.sys
sql/share/charsets/gmon.out
sql/share/gmon.out
@ -402,13 +415,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
libmysqld/examples/completion_hash.cc
libmysqld/examples/completion_hash.h
libmysqld/examples/my_readline.h
libmysqld/examples/mysql.cc
libmysqld/examples/mysqltest.c
libmysqld/examples/readline.cc
libmysqld/examples/sql_string.cc
libmysqld/examples/sql_string.h
libmysqld/examples/mysql
libmysqld/examples/mysqltest