unknown 7f70e111dd Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge ...

into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1


mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
tests/mysql_client_test.c:
  SCCS merged

2006-07-18 18:43:55 +05: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

CMakeLists.txt

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.

2006-05-11 11:29:08 -05: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

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

fork_big.pl

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08: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

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.

2006-02-12 13:26:30 -08:00

Makefile.am

Merge

2006-05-17 23:41:56 +02:00

myisam-big-rows.tst

Fix for MyISAM records > 16M

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

mysql_client_test.c

Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge

2006-07-18 18:43:55 +05: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