unknown 809d47dd2f merge ...

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

2003-03-10 14:13:46 +02:00

..

.cvsignore

Import changeset

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

config-netware.h

Fixes for Netware

2003-01-28 08:38:28 +02:00

config-os2.h

Merge with 3.23.51

2002-07-25 22:46:28 +03:00

config-win.h

Add missing SIGNAL_WITH_VIO_CLOSE to fix problem with SLAVE STOP on windows

2003-02-27 11:20:07 +02:00

dbug.h

Update copyright

2001-12-06 14:10:51 +02:00

errmsg.h

new client error added: CR_MALFORMED_PACKET

2002-12-04 17:37:51 +01:00

ft_global.h

--ft_stopword_file command-line option

2003-01-23 13:20:37 +01:00

hash.h

merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing.

2002-03-01 19:36:46 -07:00

heap.h

Added support of null keys in HEAP tables

2002-01-12 15:42:54 +02:00

m_ctype.h

Modifications to MySQL source in order to make it compile on QnX.

2002-03-13 01:28:13 +02:00

m_string.h

Fix after merge

2001-12-17 23:24:51 +02:00

Makefile.am

my_dir.h is included by raid.h

2003-03-05 13:10:23 +01:00

md5.h

Update copyright

2001-12-06 14:10:51 +02:00

merge.h

Update copyright

2001-12-06 14:10:51 +02:00

my_aes.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

my_alarm.h

Update copyright

2001-12-06 14:10:51 +02:00

my_alloc.h

Small improvement to alloc_root

2002-11-16 20:19:10 +02:00

my_base.h

my_base.h:

2003-02-18 19:57:05 +02:00

my_bitmap.h

Merge with 3.23.47

2001-12-15 05:12:21 +02:00

my_dir.h

Update copyright

2001-12-06 14:10:51 +02:00

my_getopt.h

New SET syntax & system variables.

2002-07-23 18:31:22 +03:00

my_global.h

LOAD DATA INFILE is not replicated if replicate_*_table is set

2003-02-28 22:24:00 +02:00

my_list.h

Update copyright

2001-12-06 14:10:51 +02:00

my_net.h

Fixes for Netware

2003-01-28 08:38:28 +02:00

my_no_pthread.h

merge with 3.23.52

2002-08-12 04:04:43 +03:00

my_nosys.h

Update copyright

2001-12-06 14:10:51 +02:00

my_pthread.h

Portability fix for HPUX10.20

2003-02-25 21:43:24 +02:00

my_semaphore.h

Portability fixes for 4.0.3 build.

2002-08-17 18:02:56 +03:00

my_sys.h

Merge with 3.23 to get fixes for --user and BACKUP TABLE

2003-03-10 12:48:43 +02:00

my_tree.h

Try to optimize the cache buffer size needed for bulk_insert

2002-11-20 22:56:57 +02:00

myisam.h

fix auto-increment in sub-key and insert ... select

2003-03-02 01:48:57 +01:00

myisammrg.h

ANALYZE for MERGE

2002-12-10 00:06:05 +01:00

myisampack.h

include/mysisampack.h

2002-11-12 13:28:26 +01:00

mysql_com.h

Added support for max_allowed_packet in option files read by mysql_option()

2003-01-04 15:17:16 +02:00

mysql_embed.h

New SET syntax & system variables.

2002-07-23 18:31:22 +03:00

mysql_version.h.in

Use our version of RWLOCKS on UNIXWARE 7

2002-08-21 22:04:22 +03:00

mysql.h

Fixed multi-table-delete for InnoDB tables

2003-02-17 02:14:37 +02:00

mysqld_error.h

Use our version of RWLOCKS on UNIXWARE 7

2002-08-21 22:04:22 +03:00

mysys_err.h

Added useful exit error code for programs using my_getopt in case

2002-05-29 15:07:30 +03:00

nisam.h

Update copyright

2001-12-06 14:10:51 +02:00

queues.h

Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.

2002-11-07 03:54:00 +02:00

raid.h

Lots of code fixes to the replication code (especially the binary logging and index log file handling)

2002-08-08 03:12:02 +03:00

rijndael.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

sha1.h

Made keyread (key scanning) a key specific attribute.

2002-06-19 00:22:30 +03:00

sslopt-case.h

fixed so that --ssl and --skip-ssl works with the MySQL clients.

2002-09-17 23:46:53 +03:00

sslopt-longopts.h

Update mysql-test results after merge

2002-09-18 02:21:29 +03:00

sslopt-vars.h

Update copyright

2001-12-06 14:10:51 +02:00

t_ctype.h

Update copyright

2001-12-06 14:10:51 +02:00

thr_alarm.h

Removed mysql_ssl_clear()

2002-06-27 11:27:04 +03:00

thr_lock.h

Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped

2003-03-04 12:22:35 +02:00

violite.h

postmerging fix (SCRUM)

2003-02-27 21:29:56 +02:00