unknown 2230bc9761 Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge ... into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new client/mysql.cc: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/mysql.test: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged		2006-04-24 16:17:50 -04:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
client_priv.h	Final patch to remove the last of the OS2 support.	2006-04-15 18:17:32 -07: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	Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,	2006-04-11 18:54:24 -07:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge	2006-04-24 16:17:50 -04:00
mysql_upgrade.c	mysql_upgrade.c:	2006-04-11 02:48:19 +02: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
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	Child segfault when tring to call "mysql_error(NULL)", fixed by not	2006-04-12 23:16:15 -04:00
mysqltest.c	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new	2006-04-13 10:48:24 +02: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