diff options
| author | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
| commit | e160646eb01eb8c5b382b1523114988679f9d357 (patch) | |
| tree | ceda3ef9437fa5cd2e14de6aebba351d121354c2 /sql-common/client.c | |
| parent | 8ee124176690ed611c8851e3dd50a823c498a08b (diff) | |
| parent | 853c2c788c8bd7120a95c2357de7dabb1b6fcf3b (diff) | |
| download | mariadb-git-e160646eb01eb8c5b382b1523114988679f9d357.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 9fca38f3857..7bf9c90254d 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -727,6 +727,7 @@ void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate) static void cli_flush_use_result(MYSQL *mysql) { /* Clear the current execution status */ + DBUG_ENTER("cli_flush_use_result"); DBUG_PRINT("warning",("Not all packets read, clearing them")); for (;;) { @@ -744,6 +745,7 @@ static void cli_flush_use_result(MYSQL *mysql) break; /* End of data */ } } + DBUG_VOID_RETURN; } |