diff options
author | unknown <brian@piggy.tangent.org> | 2007-08-20 13:18:40 -0700 |
---|---|---|
committer | unknown <brian@piggy.tangent.org> | 2007-08-20 13:18:40 -0700 |
commit | a56ade56ab9695a465ae5c9d08b36fd3056f85ce (patch) | |
tree | 7d790398d251f286f84524083da3c973d76fe3c8 /client | |
parent | 4a15ac2a1c251120bbcf69bc2f0fafa5242826a8 (diff) | |
parent | c8b9315db3fbdc0a26097c3451ebe89e32c49d45 (diff) | |
download | mariadb-git-a56ade56ab9695a465ae5c9d08b36fd3056f85ce.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
client/mysqlslap.c:
Auto merged
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlslap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 4578e0e4e0c..0eb3bcfd41f 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1813,6 +1813,13 @@ limit_not_met: { mysql_close(mysql); + if (!(mysql= mysql_init(NULL))) + { + fprintf(stderr,"%s: mysql_init() failed ERROR : %s\n", + my_progname, mysql_error(mysql)); + exit(0); + } + if (slap_connect(mysql)) goto end; } |