diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-12 13:53:21 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-12 13:53:21 +0200 |
| commit | c81dd9357fc6ff8dbc74fbab64ce058cc7317995 (patch) | |
| tree | ac7551542f9315d799ca67d7b86b0b38f91d51ac /client | |
| parent | 3fb85dcad140fc23137525729868f0f519871964 (diff) | |
| parent | 4779978bdc37b009798a38ca7e4c5502e1824e7b (diff) | |
| download | mariadb-git-c81dd9357fc6ff8dbc74fbab64ce058cc7317995.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index db15c6c43dd..e2317560404 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2709,12 +2709,12 @@ char *get_string(char **to_ptr, char **from_ptr, void set_reconnect(MYSQL* mysql, int val) { + my_bool reconnect= val; DBUG_ENTER("set_reconnect"); DBUG_PRINT("info", ("val: %d", val)); #if MYSQL_VERSION_ID < 50000 - mysql->reconnect= val; + mysql->reconnect= reconnect; #else - my_bool reconnect= val; mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect); #endif DBUG_VOID_RETURN; @@ -3609,7 +3609,7 @@ void scan_command_for_warnings(struct st_command *command) *end= save; } - *ptr++; + ptr++; } DBUG_VOID_RETURN; } |