unknown d0dad4bf38 Merge rurik.mysql.com:/home/igor/tmp_merge ... into rurik.mysql.com:/home/igor/dev/mysql-5.1-0 BitKeeper/deleted/.del-generate_prefix_files.pl: Delete: extra/yassl/include/openssl/generate_prefix_files.pl BitKeeper/deleted/.del-prefix_crypto.h: Delete: extra/yassl/include/openssl/prefix_crypto.h BitKeeper/deleted/.del-prefix_ssl.h: Delete: extra/yassl/include/openssl/prefix_ssl.h BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: Auto merged BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7: Auto merged BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf: Auto merged client/mysqltest.c: Auto merged extra/yassl/include/openssl/crypto.h: Auto merged extra/yassl/include/openssl/ssl.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/src/Makefile.am: Auto merged extra/yassl/src/ssl.cpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_int.cpp: Auto merged extra/yassl/testsuite/Makefile.am: Auto merged extra/yassl/yassl.vcproj: Auto merged include/violite.h: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged mysql-test/include/common-tests.inc: Auto merged mysql-test/r/analyze.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/key_cache.result: Auto merged mysql-test/r/preload.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/analyze.test: Auto merged mysql-test/t/explain.test: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/ps.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged vio/Makefile.am: Auto merged client/Makefile.am: Manual merge libmysqld/Makefile.am: Manual merge mysql-test/r/compress.result: Manual merge mysql-test/r/explain.result: Manual merge mysql-test/r/select.result: Manual merge mysql-test/r/view.result: Manual merge mysql-test/t/select.test: Manual merge mysql-test/t/view.test: Manual merge sql/sql_base.cc: Manual merge sql/sql_parse.cc: Manual merge		2006-06-09 00:23:59 -07:00
..
.cvsignore
client_priv.h	Removed double enum value.	2006-05-16 01:12:12 +03:00
CMakeLists.txt	performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.	2006-05-11 11:29:08 -05:00
completion_hash.cc	few harmless warnings from automated code-checking tools fixed	2005-01-08 21:25:31 +01:00
completion_hash.h
get_password.c	This is an implementation of two WL items:	2006-05-18 18:57:50 +04:00
Makefile.am	Merge rurik.mysql.com:/home/igor/tmp_merge	2006-06-09 00:23:59 -07:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Merge	2006-05-17 23:41:56 +02:00
mysql_upgrade.c	Win build fix	2006-05-02 08:59:49 +05:00
mysqladmin.cc	Bug#17208 SSL: client does not verify server certificate	2006-04-18 17:58:27 +02:00
mysqlbinlog.cc	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0	2006-05-30 16:07:49 +03: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 a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0	2006-05-30 16:07:49 +03:00
mysqlimport.c	Fix after merge 5.0->5.1	2006-05-12 09:10:04 +02:00
mysqlshow.c	Bug#17208 SSL: client does not verify server certificate	2006-04-18 17:58:27 +02:00
mysqlslap.c	mysqlslap.c:	2006-04-28 10:44:08 -05:00
mysqltest.c	Re-apply missing changeset, orignally pushed by elliot	2006-06-06 14:21:07 +03: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