unknown 0e978328ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1 ...

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Rollback Monty's removals of explicit casts
tests/mysql_client_test.c:
  SCCS merged

2006-11-29 11:44:37 +03: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

Additional files for cmake support

2006-08-31 19:52:42 +02: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 shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139

2006-09-15 16:42:27 +02:00

myisam-big-rows.tst

Fix for MyISAM records > 16M

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

mysql_client_test.c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

2006-11-29 11:44:37 +03:00

mysql_client_test.c.rej

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2006-10-17 19:54:44 +03: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