diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-07 13:47:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-07 13:47:03 +0200 |
| commit | 18292caa48f5cca9b651f62c1dbbffefadb33d9f (patch) | |
| tree | bbd682ee8d0b60db6e4681a6438d79c44f2ae06a /sql/protocol.cc | |
| parent | 5789f96c624d00aeef137602ab0c4828620748e8 (diff) | |
| parent | d178780289651e59baf16a36a8e451509eb8bb42 (diff) | |
| download | mariadb-git-18292caa48f5cca9b651f62c1dbbffefadb33d9f.tar.gz | |
Automatic merge
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 { |