diff options
author | unknown <guilhem@mysql.com> | 2004-12-09 15:42:06 +0100 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-12-09 15:42:06 +0100 |
commit | a5286aa9a19adbd9d3f9165337f4f85fc874036e (patch) | |
tree | f8203ab68b870c6af4e37a9ec22a0759602d99dd /tests/deadlock_test.c | |
parent | 89e77b65cd6999d1b6567f1744fbd35659d9d7b7 (diff) | |
parent | 40c2a8870b7dea27917430d995a0acb91465b892 (diff) | |
download | mariadb-git-a5286aa9a19adbd9d3f9165337f4f85fc874036e.tar.gz |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'tests/deadlock_test.c')
-rw-r--r-- | tests/deadlock_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/deadlock_test.c b/tests/deadlock_test.c index 65a0df5c215..ab8158e0cd8 100644 --- a/tests/deadlock_test.c +++ b/tests/deadlock_test.c @@ -227,6 +227,7 @@ int main() !mysql_real_connect(&sel, host, user, pass, db, 0,0,0 ) || !mysql_real_connect(&del_ins, host, user, pass, db, 0,0,0 )) die("Error in mysql_real_connect(): %s", mysql_error(&lock)); + lock.reconnect= sel.reconnect= del_ins.reconnect= 1; permute(order, num_queries); printf("count = %d\n", count); |