unknown d278381ec8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 ... into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0 client/mysql.cc: Auto merged heap/hp_delete.c: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/grant2.result: Manual merge mysql-test/r/heap_btree.result: Manual merge mysql-test/r/mysql_client.result: Manual merge mysql-test/t/grant2.test: Manual merge mysql-test/t/heap_btree.test: Manual merge mysql-test/t/mysql_client.test: Manual merge		2006-08-09 22:23:41 -04:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
client_priv.h	Bug#17208 SSL: client does not verify server certificate	2006-04-18 17:58:27 +02: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	Bug#10877 mysqldump should use consistent last line	2006-07-24 10:56:33 +02:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1	2006-08-09 22:23:41 -04: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	A fix and a test case for Bug#15752 "Lost connection to MySQL server	2006-07-24 14:56:53 +04:00
mysqlcheck.c	Bug #16502: mysqlcheck gets confused with views	2006-07-24 13:31:20 -07:00
mysqldump.c	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0	2006-08-03 12:11:07 +02:00
mysqlimport.c	Bug#15690 mysqlimport tries to set options the server doesn't understand	2006-07-20 17:30:44 +02: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	Bug #19147: mysqlshow INFORMATION_SCHEMA does not work	2006-07-21 20:29:25 -07:00
mysqltest.c	Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql	2006-08-02 16:46:55 +04: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