diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-09-07 14:24:47 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-09-07 14:24:47 +0500 |
| commit | ee511e55e7598767924d73e9fe08a480e1c2c72d (patch) | |
| tree | fc98f519aeb6ded92877f644bdef42612b5a1393 /client | |
| parent | 71ba3e55b788e8c701b7292051f04e6fce55f26f (diff) | |
| download | mariadb-git-ee511e55e7598767924d73e9fe08a480e1c2c72d.tar.gz | |
A fix (Bug #5432: Is this a leak in mysql console client?)
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 1858699e8da..3cc8b41af66 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2220,7 +2220,9 @@ com_use(String *buffer __attribute__((unused)), char *line) under our feet, for example if DROP DATABASE or RENAME DATABASE (latter one not yet available by the time the comment was written) */ - current_db= 0; // Let's reset current_db, assume it's gone + /* Let's reset current_db, assume it's gone */ + my_free(current_db, MYF(MY_ALLOW_ZERO_PTR)); + current_db= 0; /* We don't care about in case of an error below because current_db was just set to 0. @@ -2229,10 +2231,8 @@ com_use(String *buffer __attribute__((unused)), char *line) (res= mysql_use_result(&mysql))) { row= mysql_fetch_row(res); - if (row[0] && - (!current_db || cmp_database(current_db, row[0]))) + if (row[0]) { - my_free(current_db, MYF(MY_ALLOW_ZERO_PTR)); current_db= my_strdup(row[0], MYF(MY_WME)); } (void) mysql_fetch_row(res); // Read eof |