diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 17:08:28 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 17:08:28 +0200 |
| commit | 7647c2744c95f23fa7a1f4aec98359f5a9a55e01 (patch) | |
| tree | 09d739e03d7203b9aab844694882c52417875513 /sql/protocol.cc | |
| parent | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (diff) | |
| parent | a1bd9532352aed69f03b632658b4ba20512b9cd1 (diff) | |
| download | mariadb-git-7647c2744c95f23fa7a1f4aec98359f5a9a55e01.tar.gz | |
Automatic merge with MariaDB 5.1
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 786d6ef8544..8a9d712077d 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -203,7 +203,7 @@ net_send_ok(THD *thd, NET *net= &thd->net; uchar buff[MYSQL_ERRMSG_SIZE+10],*pos; bool error= FALSE; - DBUG_ENTER("my_ok"); + DBUG_ENTER("net_send_ok"); if (! net->vio) // hack for re-parsing queries { |