unknown 8d1230c6ad Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 ... into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged configure.in: Auto merged extra/yassl/include/openssl/rsa.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/include/yassl_types.hpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/taocrypt/include/integer.hpp: Auto merged extra/yassl/taocrypt/include/misc.hpp: Auto merged extra/yassl/taocrypt/src/algebra.cpp: Auto merged extra/yassl/taocrypt/src/template_instnt.cpp: Auto merged mysql-test/t/disabled.def: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged extra/yassl/include/openssl/ssl.h: Manual merge extra/yassl/src/handshake.cpp: Manual merge extra/yassl/src/yassl_int.cpp: Manual merge extra/yassl/taocrypt/include/runtime.hpp: Manual merge extra/yassl/taocrypt/src/integer.cpp: Manual merge mysql-test/mysql-test-run.pl: Manual merge mysql-test/r/trigger.result: Manual merge mysql-test/t/trigger.test: Manual merge		2006-04-27 17:35:29 +02:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
client_priv.h	BUG# 13052	2005-10-12 22:44:42 -07: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	Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause	2006-01-11 02:07:40 +03:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Merge shellback.(none):/home/msvensson/mysql/mysql-5.0	2006-04-27 17:35:29 +02:00
mysqladmin.cc	many warnings (practically safe but annoying) corrected	2006-01-03 17:54:54 +01:00
mysqlbinlog.cc	many warnings (practically safe but annoying) corrected	2006-01-03 17:54:54 +01:00
mysqlcheck.c	mysqlcheck.c:	2006-02-17 08:32:52 -06:00
mysqldump.c	Fix version of DEFINER-clause in mysqldump.	2006-03-10 22:23:04 +03:00
mysqlimport.c	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0	2005-12-04 15:34:47 +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	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0	2005-12-04 15:34:47 +02:00
mysqltest.c	Remove #if 0	2006-04-07 14:21:00 +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