unknown de00ff7626 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 ... into xiphis.org:/usr/home/antony/work2/merge-5.0 client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisammrg/myrg_static.c: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/rpl_drop_temp.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/bigint.test: Auto merged mysql-test/t/func_str.test: Auto merged mysql-test/t/rpl_drop_temp.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/my_time.c: Auto merged include/my_sys.h: manual merge 4.1->5.0 mysql-test/r/bigint.result: manual merge 4.1->5.0 mysql-test/r/subselect.result: manual merge 4.1->5.0 mysql-test/t/subselect.test: manual merge 4.1->5.0 mysys/charset.c: manual merge 4.1->5.0 sql/ha_ndbcluster.cc: manual merge 4.1->5.0 sql/item_strfunc.cc: manual merge 4.1->5.0 sql/sql_base.cc: manual merge 4.1->5.0 sql/sql_select.cc: manual merge 4.1->5.0 sql/sql_union.cc: manual merge 4.1->5.0 strings/Makefile.am: manual merge 4.1->5.0 tests/mysql_client_test.c: manual merge 4.1->5.0		2005-08-11 12:18:53 +01:00
..
.cvsignore
auto_increment.res
auto_increment.tst
big_record.pl
connect_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
deadlock_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
drop_test.pl
export.pl
fork2_test.pl
fork_big.pl
fork_big2.pl	fork_big2.pl:	2003-11-25 13:06:46 -08:00
function.res
function.tst
grant.pl	Fixed two bugs in MySQL ACL.	2005-03-17 08:16:56 +02:00
grant.res	Merge with 4.0.18	2004-02-11 00:06:46 +01:00
index_corrupt.pl	Fixed core dump bug when hot link list in key cache was empty. Bug #10167	2005-04-27 14:31:04 +03:00
insert_and_repair.pl
insert_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
list_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
lock_test.pl
lock_test.res
mail_to_db.pl	New versions of mail_to_db.pl and pmail.pl.	2005-04-09 18:37:32 +03:00
Makefile.am	Merge	2005-07-06 00:06:11 +02:00
myisam-big-rows.tst
mysql_client_test.c	Merge xiphis.org:/usr/home/antony/work2/mysql-4.1	2005-08-11 12:18:53 +01:00
pmail.pl	New versions of mail_to_db.pl and pmail.pl.	2005-04-09 18:37:32 +03:00
rename_test.pl
restore-lock.smack
select_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
showdb_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
ssl_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
table_types.pl
test_delayed_insert.pl
thread_test.c	Changing the default of libmysqlclient : it's now NO reconnection.	2004-12-09 14:44:10 +01:00
truncate.pl
udf_test	after review patch (SCRUM)	2003-10-06 11:13:25 +03:00
udf_test.res	after review patch (SCRUM)	2003-10-06 11:13:25 +03:00