unknown e9c420ccf1 Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 ... into mysql.com:/home/emurphy/src/work/mysql-5.0 BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged include/m_ctype.h: Auto merged include/my_sys.h: Auto merged innobase/srv/srv0start.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysys/charset.c: Auto merged netware/BUILD/nwbootstrap: Auto merged sql/item.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/sql_prepare.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-extra.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged configure.in: Manual merge from 4.1 include/config-netware.h: Manual merge from 4.1 sql/item.cc: Manual merge from 4.1 sql/mysqld.cc: Manual merge from 4.1		2005-08-19 15:29:30 -04:00
..
btr	btr0sea.c:	2005-08-19 12:54:13 +03:00
buf	Merge hundin.mysql.fi:/home/heikki/mysql-4.1	2005-08-03 18:30:24 +03:00
data	InnoDB ON UPDATE CASCADE fixes:	2005-05-13 12:55:59 +03:00
db	Added Innobase to source distribution	2001-02-17 14:19:19 +02:00
dict	Merge hundin.mysql.fi:/home/marko/mysql-5.0	2005-06-21 07:36:18 +03:00
dyn	Remove unnecessary files	2004-02-19 11:32:07 +02:00
eval	InnoDB: Portability fixes for warnings reported on IA-64 Windows	2005-03-07 12:03:33 +02:00
fil	Merge hundin.mysql.fi:/home/marko/mysql-4.1	2005-06-28 10:51:01 +03:00
fsp	InnoDB: Remove warnings detected by GCC 4.0.0	2005-06-20 11:06:20 +03:00
fut	Merge with 4.0.21	2004-06-18 04:38:58 +03:00
ha	Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20041027124510|04970	2004-12-08 14:34:58 +02:00
ibuf	Many files:	2005-06-27 18:58:32 +03:00
include	univ.i:	2005-08-17 18:15:50 +03:00
lock	InnoDB: Print more than 300 characters of queries in various error conditions,	2005-08-12 11:39:19 +03:00
log	Many files:	2005-06-27 18:58:32 +03:00
mach	merge with 4.0 to get security fixes and latest bug fixes	2004-02-20 17:43:02 +02:00
mem	InnoDB: Portability fixes for warnings reported on IA-64 Windows	2005-03-07 12:03:33 +02:00
mtr	InnoDB: Remove warnings detected by GCC 4.0.0	2005-06-20 11:06:20 +03:00
os	Merge hundin.mysql.fi:/home/marko/mysql-4.1	2005-07-26 14:43:48 +03:00
page	InnoDB: Fix compile-pentium-debug-max compilation problem.	2005-07-05 12:10:20 +03:00
pars	pars0lex.l:	2005-06-17 12:00:05 +03:00
que	logging_ok:	2004-12-24 12:13:32 +01:00
read	Allow consistent cursor view see changes made by creating transaction.	2005-08-18 06:38:01 +03:00
rem	InnoDB: Fix a bug in BLOB handling; optimize null flag handling.	2005-06-30 13:20:38 +03:00
row	row0sel.c:	2005-08-19 11:33:11 +03:00
srv	Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1	2005-08-19 15:29:30 -04:00
sync	sync0sync.c, sync0sync.h:	2005-07-21 18:05:10 +02:00
thr	Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613	2004-06-17 13:25:06 +03:00
trx	InnoDB: Print more than 300 characters of queries in various error conditions,	2005-08-12 11:39:19 +03:00
usr	Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870	2004-06-17 11:57:45 +03:00
ut	InnoDB: Fix ut0dbg compilation errors on NetWare	2005-06-16 15:00:25 +03:00
configure.in	WL#2286 - Compile MySQL w/YASSL support	2005-06-23 21:29:44 +05:00
Makefile.am	Remove unneeded module "com"	2004-03-11 12:55:28 +02:00
makefilewin	Added Innobase to source distribution	2001-02-17 14:19:19 +02:00
my_cnf	Added Innobase to source distribution	2001-02-17 14:19:19 +02:00