unknown bdddd8c089 Merge mysql.com:/home/jimw/my/mysql-4.1-clean ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Resolve conflicts
sql/ha_innodb.cc:
  Resolve conflicts
sql/item_strfunc.cc:
  Resolve conflicts

2005-08-31 15:24:06 -07:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

auto_increment.res

Import changeset

2000-07-31 21:29:14 +02:00

auto_increment.tst

Import changeset

2000-07-31 21:29:14 +02:00

big_record.pl

Safety fix to enable RAID in max binaries

2003-05-13 10:54:07 +03:00

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

Bug fixes for 3.23.23

2000-08-29 12:31:01 +03:00

export.pl

Fixed bug in send in mysqltest

2001-03-25 01:02:26 +02:00

fork2_test.pl

Don't do signal() on windows (Causes instability problems)

2001-10-17 19:39:39 +03:00

fork_big2.pl

Save and clear run context before executing a stored function or trigger and restore it afterwards.

2005-08-15 18:15:12 +03:00

fork_big.pl

Don't do signal() on windows (Causes instability problems)

2001-10-17 19:39:39 +03:00

function.res

Arjens LOG functions changes with small changes and tests added to mysql-test

2002-07-17 12:11:48 +04:00

function.tst

Arjens LOG functions changes with small changes and tests added to mysql-test

2002-07-17 12:11:48 +04:00

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

Don't do signal() on windows (Causes instability problems)

2001-10-17 19:39:39 +03:00

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

Import changeset

2000-07-31 21:29:14 +02:00

lock_test.res

Import changeset

2000-07-31 21:29:14 +02:00

mail_to_db.pl

New versions of mail_to_db.pl and pmail.pl.

2005-04-09 18:37:32 +03:00

Makefile.am

Fix build using --without-server. (Bug #11680)

2005-08-23 11:25:24 -07:00

myisam-big-rows.tst

Fix for MyISAM records > 16M

2001-12-11 20:45:48 +02:00

mysql_client_test.c

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-08-31 15:24:06 -07:00

pmail.pl

New versions of mail_to_db.pl and pmail.pl.

2005-04-09 18:37:32 +03:00

rename_test.pl

Don't do signal() on windows (Causes instability problems)

2001-10-17 19:39:39 +03:00

restore-lock.smack

sql/slave.cc

2000-09-19 17:23:58 -06:00

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

Safety fix to enable RAID in max binaries

2003-05-13 10:54:07 +03:00

test_delayed_insert.pl

Don't do signal() on windows (Causes instability problems)

2001-10-17 19:39:39 +03:00

thread_test.c

Changing the default of libmysqlclient : it's now NO reconnection.

2004-12-09 14:44:10 +01:00

truncate.pl

Fixed mutex problem in TRUNCATE TABLE

2002-06-04 22:59:12 +03:00

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