Commit 739465b6 authored by unknown's avatar unknown

libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".


libmysql/libmysql.c:
  Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".
parent ea10f623
...@@ -4680,7 +4680,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) ...@@ -4680,7 +4680,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *result= &stmt->result; MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data; MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net; NET *net;
DBUG_ENTER("cli_read_binary_rows");
DBUG_ENTER("cli_read_binary_rows"); DBUG_ENTER("cli_read_binary_rows");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment