unknown 95a8bb20fb Merge mysql.com:/home/gluh/MySQL/Merge/5.1 ...

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

2007-10-23 19:08:21 +05:00

..

.cvsignore

…

auto_increment.res

…

auto_increment.tst

…

big_record.pl

Safety fix to enable RAID in max binaries

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

bug25714.c

Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris

2007-08-13 16:11:25 +03:00

CMakeLists.txt

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

2007-08-02 21:18:24 +02:00

connect_test.c

Many files:

2006-12-23 20:17:15 +01:00

deadlock_test.c

my_strtoll10-x86.s:

2006-12-31 01:02:27 +01:00

drop_test.pl

…

export.pl

…

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

Many files:

2006-12-23 20:17:15 +01:00

list_test.c

Many files:

2006-12-23 20:17:15 +01:00

lock_test.pl

…

lock_test.res

…

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 xiphis.org:/anubis/antony/work/p2-bug25714.1

2007-07-24 00:03:01 -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/gluh/MySQL/Merge/5.1

2007-10-23 19:08:21 +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

…

select_test.c

Many files:

2006-12-23 20:17:15 +01:00

showdb_test.c

Many files:

2006-12-23 20:17:15 +01:00

ssl_test.c

Bug #15327: configure: --with-tcp-port option being partially ignored

2007-09-13 16:19:46 +02: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

Merge mysql.com:/home/tnurnberg/15327/50-15327

2007-09-15 04:09:38 +02:00

truncate.pl

Fixed mutex problem in TRUNCATE TABLE

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