unknown effd72a9ea Merge zim.(none):/home/ian/workspace/mysql-5.0 ... into zim.(none):/home/ian/workspace/mysql-5.1-new Updated bug message in disabled file -Brian BitKeeper/etc/ignore: auto-union include/mysql.h: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql-common/client.c: Auto merged sql/ha_innodb.cc: Auto merged sql/parse_file.cc: Auto merged sql/sql_trigger.cc: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged mysql-test/t/disabled.def: Changing message to add in bug numnber		2006-03-27 19:48:44 -08:00
..
.cvsignore
client_priv.h	client_priv.h:	2006-02-17 13:10:12 +04:00
cmakelists.txt	Fix Windows CMake compilation after merge of Magnuses ssl patch.	2006-03-16 16:57:24 +01:00
completion_hash.cc	few harmless warnings from automated code-checking tools fixed	2005-01-08 21:25:31 +01:00
completion_hash.h	upgrade readline to version 4.3	2002-11-19 18:26:53 +04:00
get_password.c	Merge with 4.0.14	2003-08-11 22:44:43 +03:00
Makefile.am	Merge	2006-02-28 23:29:58 +01:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Fix for bug #16855	2006-03-27 17:45:06 -08:00
mysqladmin.cc	many warnings (practically safe but annoying) corrected	2006-01-03 17:54:54 +01:00
mysqlbinlog.cc	Changes to make testsuite run in CMake build tree.	2006-02-10 13:29:01 +01:00
mysqlcheck.c	Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0	2006-02-17 08:33:47 -06:00
mysqldump.c	Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree	2006-03-10 22:37:38 +03:00
mysqlimport.c	This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).	2006-02-25 18:03:11 -08:00
mysqlmanager-pwgen.c	Merge with 4.0	2004-09-01 04:12:09 +03:00
mysqlmanagerc.c	Added global my_getopt_error_reporter function pointer which is	2004-08-31 21:27:58 +05:00
mysqlshow.c	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0	2005-12-04 15:34:47 +02:00
mysqlslap.c	netware doesnt use fork	2006-03-27 12:25:01 -05:00
mysqltest.c	Merge 192.168.0.100:mysql/mysql-5.0	2006-03-24 12:33:11 +01:00
readline.cc	fixed conversion errors (Windows IA64 build)	2005-03-07 09:47:24 +01:00
sql_string.cc	Merge with 4.1	2005-06-07 00:31:53 +03:00
sql_string.h	Bug#8610: The ucs2_turkish_ci collation fails with upper('i')	2005-06-06 16:54:15 +05:00