diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-11-17 18:27:28 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-11-17 18:27:28 +0400 |
| commit | 45989298eef744019474f830b874a704071810a3 (patch) | |
| tree | 0ecd129af044571daccf4e04e8f69e21aeaa1830 /mysql-test/README.stress | |
| parent | a0672f0674a03125498b345cb8e562982ff1e258 (diff) | |
| parent | e971334eced6516f92ea5b63b06ac703e145192b (diff) | |
| download | mariadb-git-45989298eef744019474f830b874a704071810a3.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-5.0-mrg
into mysql.com:/home/hf/work/mysql-5.1-mrg
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/protocol.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/include/deadlock.inc:
SCCS merged
mysql-test/t/disabled.def:
merging
sql/item.cc:
merging
Diffstat (limited to 'mysql-test/README.stress')
0 files changed, 0 insertions, 0 deletions