summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-09-05 09:30:50 +0200
committerunknown <joerg@trift2.>2007-09-05 09:30:50 +0200
commit739465b60f6606049b7eda6aca7b5c8884382c6b (patch)
tree5e1cbc1e6f9f08720d4e920f8705d90ef2858eff /libmysql
parentea10f62341cb1789becfdec92fab35d41f85bf3e (diff)
downloadmariadb-git-739465b60f6606049b7eda6aca7b5c8884382c6b.tar.gz
libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
libmysql/libmysql.c: Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 422a23e5bff..1c82a5152b4 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4680,7 +4680,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net;
- DBUG_ENTER("cli_read_binary_rows");
DBUG_ENTER("cli_read_binary_rows");