unknown eff9369d10 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 ... into mysql.com:/home/dlenev/src/mysql-5.1-merges mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/sql_select.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/tools/ndb_size.pl: Auto merged mysql-test/r/information_schema.result: Manual merge. mysql-test/t/information_schema.test: Manual merge. sql/sql_trigger.cc: Manual merge.		2005-12-24 20:13:51 +03:00
..
yassl	Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836	2005-12-24 20:13:51 +03:00
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
charset2html.c	dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features	2004-11-04 22:29:00 +01:00
comp_err.c	Fail when two messages exist for the same language for an error in the	2005-10-05 10:06:31 -07:00
innochecksum.c	Fix QNX and IRIX compilation	2005-12-08 15:13:25 +01:00
Makefile.am	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2005-12-19 08:33:27 +01:00
my_print_defaults.c	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	2005-08-26 15:56:52 +03:00
mysql_waitpid.c	Added global my_getopt_error_reporter function pointer which is	2004-08-31 21:27:58 +05:00
perror.c	fixed "perror --ndb" for 5.1 (bug #15486)	2005-12-05 14:17:53 +01:00
replace.c	fix for bug#5650 ('replace' does not follow symlinks)	2005-07-26 07:41:32 +02:00
resolve_stack_dump.c	Several fixes for Netware.	2005-08-24 22:03:34 +03:00
resolveip.c	Merge with 4.0	2004-09-01 04:12:09 +03:00