unknown 19c2ce47db Merge with 4.1 ... BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~1: Delete: Docs/Images/Makefile.am client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged sql/time.cc: Auto merged sql-common/my_time.c: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged configure.in: Merge with 4.0 mysql-test/r/mix_innodb_myisam_binlog.result: Merge with 4.0 mysys/default.c: Merge with 4.1 (to get new extension handling) sql/log.cc: Merge with 4.0 tests/client_test.c: Merge with 4.1 (to get possibility to run any tests)		2004-11-12 19:58:24 +02:00
..
.cvsignore	Import changeset	2000-07-31 21:29:14 +02:00
client_priv.h	client_priv.h:	2004-11-05 09:23:53 +04:00
completion_hash.cc	upgrade readline to version 4.3	2002-11-19 18:26:53 +04: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 with 4.1	2004-10-29 19:26:52 +03:00
my_readline.h	mysql.cc:	2004-05-05 22:47:09 +02:00
mysql.cc	Fix compiler warnings (detected by Intel's C++ compiler)	2004-10-22 18:44:51 +03:00
mysqladmin.c	mysqladmin.c:	2004-11-05 08:08:38 +04:00
mysqlbinlog.cc	Mainly resolving Guilhem's 4.1 patch to 5.0	2004-11-11 19:01:46 -08:00
mysqlcheck.c	A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa	2004-11-02 13:14:07 +04:00
mysqldump.c	Merge with 4.1	2004-11-12 19:58:24 +02:00
mysqlimport.c	Review of all code pushed since last review	2004-10-20 01:28:42 +03: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	Fixed a bug in password handling. All related to Bug#5955.	2004-10-07 22:08:17 +03:00
mysqltest.c	Merge with 4.1	2004-11-12 19:58:24 +02:00
readline.cc	mysql.cc:	2004-05-05 22:47:09 +02:00
sql_string.cc	just tried to find all 'skipp' and replace it with 'skip'.	2004-02-02 20:25:39 +04:00
sql_string.h	Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol	2003-06-14 11:37:42 +03:00