unknown c96bf55b9c Merge with 3.23.42 ...

configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

2001-09-13 09:52:35 +02:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

client_priv.h

OS2 patch

2001-09-12 23:53:31 +03:00

completion_hash.cc

Import changeset

2000-07-31 21:29:14 +02:00

completion_hash.h

Import changeset

2000-07-31 21:29:14 +02:00

connect_test.c

Import changeset

2000-07-31 21:29:14 +02:00

errmsg.c

fixed new error messages and got vio to compile

2001-06-08 21:26:59 -06:00

get_password.c

Import changeset

2000-07-31 21:29:14 +02:00

insert_test.c

Redefinition of myisam_bulk_insert_tree_size

2001-07-10 15:53:08 +03:00

list_test.c

Import changeset

2000-07-31 21:29:14 +02:00

Makefile.am

Merge with 3.23.42

2001-09-13 09:52:35 +02:00

my_readline.h

Cleanup of tests

2000-12-28 19:25:41 +02:00

mysql.cc

Merge with 3.23.42

2001-09-13 09:52:35 +02:00

mysqladmin.c

OS2 patch

2001-09-12 23:53:31 +03:00

mysqlbinlog.cc

OS2 patch

2001-09-12 23:53:31 +03:00

mysqlcheck.c

OS2 patch

2001-09-12 23:53:31 +03:00

mysqldump.c

Merge work.mysql.com:/home/bk/mysql

2001-09-04 01:04:32 +02:00

mysqlimport.c

OS2 patch

2001-09-12 23:53:31 +03:00

mysqlshow.c

Added --verbose option to mysqlshow

2001-06-12 11:59:14 +03:00

mysqltest.c

merge with 3.23.42

2001-09-02 18:38:33 +02:00

password.c

Import changeset

2000-07-31 21:29:14 +02:00

readline.cc

Cleanup of tests

2000-12-28 19:25:41 +02:00

select_test.c

Import changeset

2000-07-31 21:29:14 +02:00

showdb_test.c

Import changeset

2000-07-31 21:29:14 +02:00

sql_string.cc

changed to use IO_CACHE instead of FILE

2000-11-15 23:00:06 +02:00

sql_string.h

changed to use IO_CACHE instead of FILE

2000-11-15 23:00:06 +02:00

ssl_test.c

Import changeset

2000-07-31 21:29:14 +02:00

thimble.cc

added loops and other cool stuff to mysqltest

2000-12-02 10:11:50 -07:00

thread_test.c

Warning fixes

2001-08-23 03:05:56 +08:00